Changeset 2833 for trunk/CMakeLists.txt

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.

File:

• trunk/CMakeLists.txt (modified) (2 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()