- Timestamp:
- 02/17/15 17:43:20 (10 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/cmake/standalone.cmake
r2277 r3028 36 36 add_subdirectory( share ) 37 37 add_subdirectory( bin ) 38 add_subdirectory( external-alma/components ) 38 39 endmacro( asap_add_subdirectory ) -
trunk/cmake/withcasa.cmake
r3006 r3028 199 199 add_definitions( -DWITHOUT_ACS ) 200 200 201 set( COMPONENTS_INCLUDE_ROOT ${CASA_CODE_PATH} ) 202 if ( EXISTS ${CASA_CODE_PATH}/include/components ) 203 set( COMPONENTS_INCLUDE_ROOT ${CASA_CODE_PATH}/include ) 204 endif() 205 set( COMPONENTS_INCLUDE_DIR ${COMPONENTS_INCLUDE_ROOT}/components/SpectralComponents ) 206 if ( NOT COMPONENTS_LIB_PATH ) 207 set( COMPONENTS_LIBRARY ${casaroot}/${arch}/lib/libcomponents${CMAKE_SHARED_LIBRARY_SUFFIX} ) 208 else( ) 209 set( COMPONENTS_LIBRARY ${COMPONENTS_LIB_PATH} ) 210 endif( ) 211 201 212 # 202 213 # subdirectories -
trunk/src/CMakeLists.txt
r2872 r3028 10 10 include_directories( ${SRCDIR} 11 11 ${Boost_INCLUDE_DIR} 12 ${COMPONENTS_INCLUDE_DIR} 12 13 ${ASAPROOT}/external-alma 13 14 ${ASAPROOT}/external/libpyrap/pyrap-0.3.2 ) … … 137 138 ${ATNFLIB} 138 139 #${CASACORE_LIBRARIES} 139 ${WCSLIB} ) 140 ${WCSLIB} 141 ${COMPONENTS_LIBRARY} ) 140 142 target_link_libraries( ${ASAPPYLIB} 141 143 ${ASAPLIB} )
Note:
See TracChangeset
for help on using the changeset viewer.