Changeset 2833


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/CMakeLists.txt

    r2830 r2833  
    515515# PGPLOT (FORTRAN plotting package).
    516516# depends on X11
    517 if( STANDALONE )
    518   ############
    519   find_path( PGPLOT_INCLUDE_DIRS cpgplot.h
    520              PATHS /usr
    521              PATH_SUFFIXES include )
    522   if( PGPLOT_INCLUDE_DIRS MATCHES "NOTFOUND$" )
    523     message( FATAL ERROR "cpgplot.h could not be found. Please check!" )
    524   endif()
    525   find_library( CPGPLOT_LIB libcpgplot.${SO}
    526                 PATHS /usr
    527                 PATH_SUFFIXES lib64 lib )
    528   if( CPGPLOT_LIB MATCHES "NOTFOUND$" )
    529     message( FATAL ERROR "libcpgplot could not be found. Please check!" )
    530   endif()
    531   find_library( PGPLOT_LIB libpgplot.${SO}
    532                 PATHS /usr
    533                 PATH_SUFFIXES lib64 lib )
    534   if( PGPLOT_LIB MATCHES "NOTFOUND$" )
    535     message( FATAL ERROR "libpgplot could not be found. Please check!" )
    536   endif()
    537   set( PGPLOT_LIBRARIES "${CPGPLOT_LIB} ${PGPLOT_LIB} ${X11_LIBRARIES} ${FORTRAN_LIBRARIES} " )
    538   ############
    539 else()
     517# not require in standalone mode
     518if( NOT STANDALONE )
    540519  if( APPLE )
    541520    set( _deps FORTRAN )
     
    558537    LIBS pgplot${pgplot_ext} cpgplot${pgplot_ext}
    559538    DEPENDS ${_deps} )
     539
     540  add_definitions( -DENABLE_PLOTTER2 )
    560541endif()
    561542
  • trunk/src/CMakeLists.txt

    r2832 r2833  
    1919add_definitions( -DHAVE_LIBPYRAP )
    2020
    21 # enable plotter2
    22 add_definitions( -DENABLE_PLOTTER2 )
    23 
    2421# source files for libpyrap
    2522set( ASAP_SRCS
    26      ${SRCDIR}/Plotter2.cpp
    2723     ${SRCDIR}/concurrent.cpp
    2824     ${SRCDIR}/MathUtils.cpp
     
    8379     ${SRCDIR}/CalibrationManager.cpp )
    8480
     81if ( NOT STANDALONE )
     82set( ASAP_SRCS
     83     ${ASAP_SRCS}
     84     ${SRCDIR}/Plotter2.cpp )
     85endif()
     86
    8587set( ASAP_PYSRCS
    86      ${SRCDIR}/python_Plotter2.cpp
    8788     ${SRCDIR}/python_Scantable.cpp
    8889     ${SRCDIR}/python_STFiller.cpp
     
    108109     ${SRCDIR}/python_CalibrationManager.cpp
    109110     ${SRCDIR}/python_asap.cpp )
     111
     112if ( NOT STANDALONE )
     113set( ASAP_PYSRCS
     114     ${ASAP_PYSRCS}
     115     ${SRCDIR}/python_Plotter2.cpp )
     116endif()
    110117
    111118add_library( ${ASAPLIB} SHARED ${ASAP_SRCS} )
Note: See TracChangeset for help on using the changeset viewer.