Changeset 2833 for trunk/src

Timestamp:

07/31/13 22:35:35 (12 years ago)

Author:

WataruKawasaki

Message:

New Development: No

JIRA Issue: Yes (CAS-3620)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: Yes

Module(s): sd

Description: modified so that building standalone ASAP using cmake doesn't require pgplot, doesn't compile/link plotter2 module, and plotter2 is excluded from asap module.

File:

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

trunk/src/CMakeLists.txt

@@ -19 +19 @@
 add_definitions( -DHAVE_LIBPYRAP )
 
-# enable plotter2
-add_definitions( -DENABLE_PLOTTER2 )
-
 # source files for libpyrap
 set( ASAP_SRCS
-     ${SRCDIR}/Plotter2.cpp
      ${SRCDIR}/concurrent.cpp
      ${SRCDIR}/MathUtils.cpp
@@ -83 +79 @@
      ${SRCDIR}/CalibrationManager.cpp )
 
+if ( NOT STANDALONE )
+set( ASAP_SRCS
+     ${ASAP_SRCS}
+     ${SRCDIR}/Plotter2.cpp )
+endif()
+
 set( ASAP_PYSRCS
-     ${SRCDIR}/python_Plotter2.cpp
      ${SRCDIR}/python_Scantable.cpp
      ${SRCDIR}/python_STFiller.cpp
@@ -108 +109 @@
      ${SRCDIR}/python_CalibrationManager.cpp
      ${SRCDIR}/python_asap.cpp )
+
+if ( NOT STANDALONE )
+set( ASAP_PYSRCS
+     ${ASAP_PYSRCS}
+     ${SRCDIR}/python_Plotter2.cpp )
+endif()
 
 add_library( ${ASAPLIB} SHARED ${ASAP_SRCS} )