Changeset 1957 for trunk/src

Timestamp:

12/06/10 16:38:24 (14 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-2668

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Adds wcslib, rpfits, cfitsio libraries.
Includes CASA's cmake modules for searching python, cfitsio, and rpfits.
Update dependency.

Test build and sd regression run.
All sd regressions are passed.

File:

• trunk/src/CMakeLists.txt (modified) (3 diffs)

trunk/src/CMakeLists.txt

@@ -2 +2 @@
 # CMakeLists.txt for _asap.so
 ###
-
-# library name is _asap.so
-set( ASAPLIB _asap.so )
 
 # root for libatnf
@@ -11 +8 @@
 
 # include path
-include_directories( ${SRCDIR} )
-include_directories( ${ASAPROOT}/external-alma )
+include_directories( ${SRCDIR} 
+                     ${Boost_INCLUDE_DIR}
+                     ${ASAPROOT}/external-alma 
+                     ${ASAPROOT}/external/libpyrap/pyrap-0.3.2 )
 
 # link path
 link_directories( ${SRCDIR} )
+
+# use libpyrap
+add_definitions( -DHAVE_LIBPYRAP )
 
 # source files for libpyrap
@@ -73 +75 @@
 
 add_library( ${ASAPLIB} SHARED ${ASAP_SRCS} ${ASAP_PYSRCS} )
+
+# library name must be _asap.so
 set_target_properties( ${ASAPLIB}
                        PROPERTIES
-                       PREFIX ""
-                       SUFFIX "" )
-target_link_libraries( ${ASAPLIB} pyrap atnf ${CASACORE_LIBRARIES} )
+                       PREFIX "" )
+
+target_link_libraries( ${ASAPLIB} 
+                       ${Boost_LIBRARIES}
+                       ${PYRAPLIB} 
+                       ${ATNFLIB} 
+                       ${CASACORE_LIBRARIES} 
+                       ${WCSLIB} )
 
 # install directory