Changeset 3005


Ignore:
Timestamp:
10/16/14 12:35:03 (9 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/CMakeLists.txt

    r3004 r3005  
    2020message( STATUS "PKSMS = " ${PKSMS} )
    2121
    22 # Use casapy's fork of casacore 
     22# Use casapy's fork of casacore
    2323if ( NOT STANDALONE )
    2424  add_definitions( -DUSE_CASAPY )
     
    4646
    4747#
    48 # build type and their flags 
     48# build type and their flags
    4949#
    5050# CMAKE_BUILD_TYPE (Release, Debug, RelWithDebInfo, MinSizeRel, Profile)
     
    119119         set( DEFAULT_CXX_FLAGS "${DEFAULT_CXX_FLAGS} -arch ${archflag}" )
    120120      endif()
    121    endif()         
     121   endif()
    122122elseif( CMAKE_SYSTEM_NAME STREQUAL Linux )
    123123   set( SO so )
     
    179179   # use casacore libraries
    180180   set( _includename casa/aipsdef.h )
    181    find_path( CASACORE_INCLUDE_DIR ${_includename} 
     181   find_path( CASACORE_INCLUDE_DIR ${_includename}
    182182              PATHS ${CASACORE_PATHS}
    183               PATH_SUFFIXES include include/casacore 
     183              PATH_SUFFIXES include include/casacore
    184184              NO_DEFAULT_PATH )
    185185   find_path( CASACORE_INCLUDE_DIR ${_includename} )
     
    204204      unset( _casacore_lib CACHE )
    205205      find_library( _casacore_lib ${_libname}
    206                     PATHS ${CASACORE_PATHS} 
     206                    PATHS ${CASACORE_PATHS}
    207207                    PATH_SUFFIXES lib64 lib )
    208208      if( _casacore_lib MATCHES "NOTFOUND$" )
     
    217217   # use libcasacore
    218218   set( _libname libcasacore.${SO} )
    219    find_library( CASACORE_LIBRARIES ${_libname} 
     219   find_library( CASACORE_LIBRARIES ${_libname}
    220220                 PATHS ${CASACORE_PATHS}
    221221                 PATH_SUFFIXES lib64 lib )
     
    229229              PATH_SUFFIXES include include/casacore
    230230              NO_DEFAULT_PATH )
    231    find_path( CASACORE_INCLUDE_DIR ${_includename} 
     231   find_path( CASACORE_INCLUDE_DIR ${_includename}
    232232              PATHS ${CASACORE_PATHS}
    233               PATH_SUFFIXES include include/casacore 
    234               NO_DEFAULT_PATH ) 
    235    find_path( CASACORE_INCLUDE_DIR ${_includename} ) 
     233              PATH_SUFFIXES include include/casacore
     234              NO_DEFAULT_PATH )
     235   find_path( CASACORE_INCLUDE_DIR ${_includename} )
    236236   if( CASACORE_INCLUDE_DIR MATCHES "NOTFOUND$" )
    237237     message( FATAL_ERROR "${_includename} could not be found. Please check!" )
     
    258258   string( REGEX MATCH [0-9].[0-9] PYTHONV ${PYTHON_INCLUDE_DIRS} )
    259259   string( REPLACE "." "" PV ${PYTHONV} )
    260    find_path( NUMPY_INCLUDE_DIR numpy/npy_interrupt.h 
     260   find_path( NUMPY_INCLUDE_DIR numpy/npy_interrupt.h
    261261              PATHS
    262                  ${pyroot}/lib/python${PYTHONV}/site-packages/numpy/core 
    263                  ${pyroot}/Library/Frameworks/Python.framework/Versions/${PYTHONV} 
    264                  ${pyroot}/Library/Frameworks/Python.framework/Versions/${PYTHONV}/lib/python${PYTHONV}/site-packages/numpy/core 
     262                 ${pyroot}/lib/python${PYTHONV}/site-packages/numpy/core
     263                 ${pyroot}/Library/Frameworks/Python.framework/Versions/${PYTHONV}
     264                 ${pyroot}/Library/Frameworks/Python.framework/Versions/${PYTHONV}/lib/python${PYTHONV}/site-packages/numpy/core
    265265              PATH_SUFFIXES include )
    266266   if( NUMPY_INCLUDE_DIR MATCHES "NOTFOUND$" )
     
    288288      foreach( _v ${_names} )
    289289
    290          casa_find( 
     290         casa_find(
    291291            PYTHON${_v}
    292292            #PREFIX_HINTS ${PYTHON_ROOT_DIR}
    293             LIBS python${_v} 
    294             NO_REQUIRE 
     293            LIBS python${_v}
     294            NO_REQUIRE
    295295         )
    296296
     
    318318   set( python_library python${PYTHON_LIBNAME} )
    319319
    320    # Form the Python install prefix by stripping away "lib/libpython2.5.2.dylib" (example) from 
     320   # Form the Python install prefix by stripping away "lib/libpython2.5.2.dylib" (example) from
    321321   # the full python library path
    322322   string( REGEX MATCH "/lib(64)?/lib${python_library}" _match ${PYTHON${PYTHON_LIBNAME}_LIBRARIES} )
     
    343343   casa_find( PYTHON
    344344      VERSION 2.5    # minimum required
    345       INCLUDES Python.h 
     345      INCLUDES Python.h
    346346         numpy/npy_interrupt.h   # for numpy
    347347      INCLUDES_SUFFIXES python${PYTHONV}
    348       PREFIX_HINTS 
     348      PREFIX_HINTS
    349349         ${python_prefix}/lib/python${PYTHONV}/site-packages/numpy/core
    350350         ${python_prefix}/Library/Frameworks/Python.framework/Versions/${PYTHONV}
     
    399399   message( FATAL_ERROR "lapack could not be found. Please check!" )
    400400endif()
    401 message( STATUS "LAPACK_LIBRARIES = " ${LAPACK_LIBRARIES} ) 
     401message( STATUS "LAPACK_LIBRARIES = " ${LAPACK_LIBRARIES} )
    402402
    403403
     
    433433                 NO_DEFAULT_PATH )
    434434   if( CFITSIO_LIBRARIES MATCHES "NOTFOUND$" )
    435       find_library( CFITSIO_LIBRARIES libcfitsio.a 
     435      find_library( CFITSIO_LIBRARIES libcfitsio.a
    436436                    PATHS ${CFITSIO_ROOT}
    437437                    PATH_SUFFIXES lib64 lib
    438438                    NO_DEFAULT_PATH )
    439439   endif()
    440    find_library( CFITSIO_LIBRARIES libcfitsio.${SO} 
     440   find_library( CFITSIO_LIBRARIES libcfitsio.${SO}
    441441                 PATHS /usr/local /usr
    442442                 PATH_SUFFIXES lib64 lib )
     
    491491        CACHE STRING "Fortran library linker option" FORCE )
    492492    else()
    493       set( FORTRAN_LIBRARIES -lgfortran 
     493      set( FORTRAN_LIBRARIES -lgfortran
    494494        CACHE STRING "Fortran library linker option" FORCE )
    495495    endif()
     
    546546# RPFITS
    547547#
    548 if ( STANDALONE ) 
     548if ( STANDALONE )
    549549   find_path( RPFITS_INCLUDE_DIRS RPFITS.h
    550550              PATHS /usr/local /usr
     
    583583   message( STATUS "${_wcslib} could not be found." )
    584584   unset( _wcslib CACHE )
    585    unset( WCSLIB CACHE ) 
     585   unset( WCSLIB CACHE )
    586586   set( _wcslib libwcs.${_wcs_version}.${SO} )
    587587   message( STATUS "Try to find ${_wcslib}..." )
    588    find_library( WCSLIB ${_wcslib} 
     588   find_library( WCSLIB ${_wcslib}
    589589                 PATHS ${WCSLIB_PATHS}
    590590                 PATH_SUFFIXES lib64 lib )
     
    606606# common include path
    607607#
    608 include_directories( ${CASACORE_INCLUDE_DIR} 
    609                      ${Boost_INCLUDE_DIR} 
    610                      ${X11_INCLUDE_DIRS} 
    611                      ${PGPLOT_INCLUDE_DIRS} 
    612                      ${PYTHON_INCLUDE_DIRS} 
    613                      ${WCSLIB_INCLUDE_DIR} 
    614                      ${CFITSIO_INCLUDE_DIRS} 
     608include_directories( ${CASACORE_INCLUDE_DIR}
     609                     ${Boost_INCLUDE_DIR}
     610                     ${X11_INCLUDE_DIRS}
     611                     ${PGPLOT_INCLUDE_DIRS}
     612                     ${PYTHON_INCLUDE_DIRS}
     613                     ${WCSLIB_INCLUDE_DIR}
     614                     ${CFITSIO_INCLUDE_DIRS}
    615615                     ${RPFITS_INCLUDE_DIRS} )
    616616
Note: See TracChangeset for help on using the changeset viewer.