Changeset 2833

Timestamp:

07/31/13 22:35:35 (11 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.

Location:

trunk

Files:

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

trunk/CMakeLists.txt

@@ -515 +515 @@
 # PGPLOT (FORTRAN plotting package).
 # depends on X11
-if( STANDALONE )
-  ############
-  find_path( PGPLOT_INCLUDE_DIRS cpgplot.h
-             PATHS /usr
-             PATH_SUFFIXES include )
-  if( PGPLOT_INCLUDE_DIRS MATCHES "NOTFOUND$" )
-    message( FATAL ERROR "cpgplot.h could not be found. Please check!" )
-  endif()
-  find_library( CPGPLOT_LIB libcpgplot.${SO}
-                PATHS /usr
-                PATH_SUFFIXES lib64 lib )
-  if( CPGPLOT_LIB MATCHES "NOTFOUND$" )
-    message( FATAL ERROR "libcpgplot could not be found. Please check!" )
-  endif()
-  find_library( PGPLOT_LIB libpgplot.${SO}
-                PATHS /usr
-                PATH_SUFFIXES lib64 lib )
-  if( PGPLOT_LIB MATCHES "NOTFOUND$" )
-    message( FATAL ERROR "libpgplot could not be found. Please check!" )
-  endif()
-  set( PGPLOT_LIBRARIES "${CPGPLOT_LIB} ${PGPLOT_LIB} ${X11_LIBRARIES} ${FORTRAN_LIBRARIES} " )
-  ############
-else()
+# not require in standalone mode
+if( NOT STANDALONE )
   if( APPLE )
     set( _deps FORTRAN )
@@ -558 +537 @@
     LIBS pgplot${pgplot_ext} cpgplot${pgplot_ext}
     DEPENDS ${_deps} )
+
+  add_definitions( -DENABLE_PLOTTER2 )
 endif()
 

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} )