Changeset 3005 for trunk

Timestamp:

10/16/14 12:35:03 (10 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs:

Put in Release Notes: No

Module(s): cmake build of asap

Description: removed trailing white spaces.

File:

• trunk/CMakeLists.txt (modified) (17 diffs)

trunk/CMakeLists.txt

@@ -20 +20 @@
 message( STATUS "PKSMS = " ${PKSMS} )
 
-# Use casapy's fork of casacore  
+# Use casapy's fork of casacore
 if ( NOT STANDALONE )
   add_definitions( -DUSE_CASAPY )
@@ -46 +46 @@
 
 #
-# build type and their flags 
+# build type and their flags
 #
 # CMAKE_BUILD_TYPE (Release, Debug, RelWithDebInfo, MinSizeRel, Profile)
@@ -119 +119 @@
          set( DEFAULT_CXX_FLAGS "${DEFAULT_CXX_FLAGS} -arch ${archflag}" )
       endif()
-   endif()         
+   endif()
 elseif( CMAKE_SYSTEM_NAME STREQUAL Linux )
    set( SO so )
@@ -179 +179 @@
    # use casacore libraries 
    set( _includename casa/aipsdef.h )
-   find_path( CASACORE_INCLUDE_DIR ${_includename} 
+   find_path( CASACORE_INCLUDE_DIR ${_includename}
               PATHS ${CASACORE_PATHS}
-              PATH_SUFFIXES include include/casacore 
+              PATH_SUFFIXES include include/casacore
               NO_DEFAULT_PATH )
    find_path( CASACORE_INCLUDE_DIR ${_includename} ) 
@@ -204 +204 @@
       unset( _casacore_lib CACHE )
       find_library( _casacore_lib ${_libname}
-                    PATHS ${CASACORE_PATHS} 
+                    PATHS ${CASACORE_PATHS}
                     PATH_SUFFIXES lib64 lib )
       if( _casacore_lib MATCHES "NOTFOUND$" )
@@ -217 +217 @@
    # use libcasacore
    set( _libname libcasacore.${SO} )
-   find_library( CASACORE_LIBRARIES ${_libname} 
+   find_library( CASACORE_LIBRARIES ${_libname}
                  PATHS ${CASACORE_PATHS} 
                  PATH_SUFFIXES lib64 lib )
@@ -229 +229 @@
               PATH_SUFFIXES include include/casacore
               NO_DEFAULT_PATH )
-   find_path( CASACORE_INCLUDE_DIR ${_includename} 
+   find_path( CASACORE_INCLUDE_DIR ${_includename}
               PATHS ${CASACORE_PATHS}
-              PATH_SUFFIXES include include/casacore 
-              NO_DEFAULT_PATH ) 
-   find_path( CASACORE_INCLUDE_DIR ${_includename} ) 
+              PATH_SUFFIXES include include/casacore
+              NO_DEFAULT_PATH )
+   find_path( CASACORE_INCLUDE_DIR ${_includename} )
    if( CASACORE_INCLUDE_DIR MATCHES "NOTFOUND$" )
      message( FATAL_ERROR "${_includename} could not be found. Please check!" )
@@ -258 +258 @@
    string( REGEX MATCH [0-9].[0-9] PYTHONV ${PYTHON_INCLUDE_DIRS} )
    string( REPLACE "." "" PV ${PYTHONV} )
-   find_path( NUMPY_INCLUDE_DIR numpy/npy_interrupt.h 
+   find_path( NUMPY_INCLUDE_DIR numpy/npy_interrupt.h
               PATHS 
-                 ${pyroot}/lib/python${PYTHONV}/site-packages/numpy/core 
-                 ${pyroot}/Library/Frameworks/Python.framework/Versions/${PYTHONV} 
-                 ${pyroot}/Library/Frameworks/Python.framework/Versions/${PYTHONV}/lib/python${PYTHONV}/site-packages/numpy/core 
+                 ${pyroot}/lib/python${PYTHONV}/site-packages/numpy/core
+                 ${pyroot}/Library/Frameworks/Python.framework/Versions/${PYTHONV}
+                 ${pyroot}/Library/Frameworks/Python.framework/Versions/${PYTHONV}/lib/python${PYTHONV}/site-packages/numpy/core
               PATH_SUFFIXES include )
    if( NUMPY_INCLUDE_DIR MATCHES "NOTFOUND$" )
@@ -288 +288 @@
       foreach( _v ${_names} )
 
-         casa_find( 
+         casa_find(
             PYTHON${_v}
             #PREFIX_HINTS ${PYTHON_ROOT_DIR}
-            LIBS python${_v} 
-            NO_REQUIRE 
+            LIBS python${_v}
+            NO_REQUIRE
          )
 
@@ -318 +318 @@
    set( python_library python${PYTHON_LIBNAME} )
 
-   # Form the Python install prefix by stripping away "lib/libpython2.5.2.dylib" (example) from 
+   # Form the Python install prefix by stripping away "lib/libpython2.5.2.dylib" (example) from
    # the full python library path
    string( REGEX MATCH "/lib(64)?/lib${python_library}" _match ${PYTHON${PYTHON_LIBNAME}_LIBRARIES} )
@@ -343 +343 @@
    casa_find( PYTHON
       VERSION 2.5    # minimum required
-      INCLUDES Python.h 
+      INCLUDES Python.h
          numpy/npy_interrupt.h   # for numpy
       INCLUDES_SUFFIXES python${PYTHONV}
-      PREFIX_HINTS 
+      PREFIX_HINTS
          ${python_prefix}/lib/python${PYTHONV}/site-packages/numpy/core
          ${python_prefix}/Library/Frameworks/Python.framework/Versions/${PYTHONV}
@@ -399 +399 @@
    message( FATAL_ERROR "lapack could not be found. Please check!" )
 endif()
-message( STATUS "LAPACK_LIBRARIES = " ${LAPACK_LIBRARIES} ) 
+message( STATUS "LAPACK_LIBRARIES = " ${LAPACK_LIBRARIES} )
 
 
@@ -433 +433 @@
                  NO_DEFAULT_PATH )
    if( CFITSIO_LIBRARIES MATCHES "NOTFOUND$" )
-      find_library( CFITSIO_LIBRARIES libcfitsio.a 
+      find_library( CFITSIO_LIBRARIES libcfitsio.a
                     PATHS ${CFITSIO_ROOT}
                     PATH_SUFFIXES lib64 lib
                     NO_DEFAULT_PATH )
    endif()
-   find_library( CFITSIO_LIBRARIES libcfitsio.${SO} 
+   find_library( CFITSIO_LIBRARIES libcfitsio.${SO}
                  PATHS /usr/local /usr
                  PATH_SUFFIXES lib64 lib )
@@ -491 +491 @@
         CACHE STRING "Fortran library linker option" FORCE )
     else()
-      set( FORTRAN_LIBRARIES -lgfortran 
+      set( FORTRAN_LIBRARIES -lgfortran
         CACHE STRING "Fortran library linker option" FORCE )
     endif()
@@ -546 +546 @@
 # RPFITS
 #
-if ( STANDALONE ) 
+if ( STANDALONE )
    find_path( RPFITS_INCLUDE_DIRS RPFITS.h
               PATHS /usr/local /usr
@@ -583 +583 @@
    message( STATUS "${_wcslib} could not be found." )
    unset( _wcslib CACHE )
-   unset( WCSLIB CACHE ) 
+   unset( WCSLIB CACHE )
    set( _wcslib libwcs.${_wcs_version}.${SO} )
    message( STATUS "Try to find ${_wcslib}..." )
-   find_library( WCSLIB ${_wcslib} 
+   find_library( WCSLIB ${_wcslib}
                  PATHS ${WCSLIB_PATHS}
                  PATH_SUFFIXES lib64 lib )
@@ -606 +606 @@
 # common include path
 #
-include_directories( ${CASACORE_INCLUDE_DIR} 
-                     ${Boost_INCLUDE_DIR} 
-                     ${X11_INCLUDE_DIRS} 
-                     ${PGPLOT_INCLUDE_DIRS} 
-                     ${PYTHON_INCLUDE_DIRS} 
-                     ${WCSLIB_INCLUDE_DIR} 
-                     ${CFITSIO_INCLUDE_DIRS} 
+include_directories( ${CASACORE_INCLUDE_DIR}
+                     ${Boost_INCLUDE_DIR}
+                     ${X11_INCLUDE_DIRS}
+                     ${PGPLOT_INCLUDE_DIRS}
+                     ${PYTHON_INCLUDE_DIRS}
+                     ${WCSLIB_INCLUDE_DIR}
+                     ${CFITSIO_INCLUDE_DIRS}
                      ${RPFITS_INCLUDE_DIRS} )