Changeset 2577 for trunk

Timestamp:

06/27/12 12:58:28 (13 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

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...

Defined PKSMS option in cmake.
if PKSMS=ON, PKSMSreader/writer will be built while if PKSMS=OFF,
those classes will be ignored. Default is OFF.

Location:

trunk

Files:

• CMakeLists.txt (modified) (3 diffs)
• external-alma/atnf/CMakeLists.txt (modified) (2 diffs)
• src/STWriter.cpp (modified) (3 diffs)

trunk/CMakeLists.txt

@@ -13 +13 @@
         "set ON to build standalone mode"
         OFF )
+option( PKSMS
+        "set ON to diable to build PKSMS2reader/writer"
+        OFF )
 message( STATUS "USE_LIBCASACORE = " ${USE_LIBCASACORE} )
 message( STATUS "STANDALONE = " ${STANDALONE} )
+message( STATUS "PKSMS = " ${PKSMS} )
 
 # Use casapy's fork of casacore  
@@ -151 +155 @@
 
 add_definitions( ${CASACORE_DEFINITIONS} )
-
 
 #
@@ -601 +604 @@
 set( CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/lib )
 
-
+#
+# PKSMS
+#
+if ( NOT PKSMS )
+   add_definitions( -DNOPKSMS )
+endif()
 
 #

trunk/external-alma/atnf/CMakeLists.txt

@@ -15 +15 @@
 link_directories( ${ATNFROOT} )
 
-# source files for libpyrap
+# source files for libatnf
 set( ATNF_SRCS
      ${ATNFDIR}/${PKS}/pks_maths.cc
@@ -33 +33 @@
      ${ATNFDIR}/${PKSIO}/NROReader.cc
      ${ATNFDIR}/${PKSIO}/PKSFITSreader.cc
-     ${ATNFDIR}/${PKSIO}/PKSMS2reader.cc
-     ${ATNFDIR}/${PKSIO}/PKSMS2writer.cc
+#     ${ATNFDIR}/${PKSIO}/PKSMS2reader.cc
+#     ${ATNFDIR}/${PKSIO}/PKSMS2writer.cc
      ${ATNFDIR}/${PKSIO}/PKSreader.cc
      ${ATNFDIR}/${PKSIO}/PKSSDwriter.cc
      ${ATNFDIR}/${PKSIO}/SDFITSreader.cc
      ${ATNFDIR}/${PKSIO}/SDFITSwriter.cc )
+if( PKSMS )
+   set( ATNF_SRCS ${ATNF_SRCS}
+                  ${ATNFDIR}/${PKSIO}/PKSMS2reader.cc
+                  ${ATNFDIR}/${PKSIO}/PKSMS2writer.cc )
+endif()  
+
 add_library( ${ATNFLIB} SHARED ${ATNF_SRCS} )
 target_link_libraries( ${ATNFLIB} 

trunk/src/STWriter.cpp

@@ -40 +40 @@
 
 #include <atnf/PKSIO/PKSrecord.h>
+#ifndef NOPKSMS
 #include <atnf/PKSIO/PKSMS2writer.h>
+#endif
 #include <atnf/PKSIO/PKSSDwriter.h>
 #include <atnf/PKSIO/SrcType.h>
@@ -66 +68 @@
   t.upcase();
   if (t == "MS2") {
+    #ifdef NOPKSMS
+    throw (AipsError("MS2 OUTPUT FORMAT IS NO LONGER SUPPORTED"));
+    #else
     writer_ = new PKSMS2writer();
+    #endif
   } else if (t == "SDFITS") {
     writer_ = new PKSSDwriter();
@@ -93 +99 @@
   t.upcase();
   if (t== "MS2") {
+    #ifdef NOPKSMS
+    throw (AipsError("MS2 OUTPUT FORMAT IS NO LONGER SUPPORTED"));
+    #else
     writer_ = new PKSMS2writer();
+    #endif
   } else if (t== "SDFITS") {
     writer_ = new PKSSDwriter();