Changeset 2417 for trunk

Timestamp:

02/22/12 05:32:47 (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...

Changes along with Michel's code re-organization on alma modules.
Currently, oldasdm2ASAP will not be built since its counterpart
(libalma module) is overwritten. Furthermore, asdm2ASAP will be linked
to libalma module, not to libalma_v3 module since libalma_v3 is
renamed as libalma.

Location:

trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• cmake/withcasa.cmake (modified) (2 diffs)

trunk/CMakeLists.txt

@@ -604 +604 @@
 set( ASAP2TO3 asap2to3 )
 if ( NOT STANDALONE )
-   set( ASDM2ASAP_OLD oldasdm2ASAP )
+#   set( ASDM2ASAP_OLD oldasdm2ASAP )
    set( ASDM2ASAP asdm2ASAP )
 endif()

trunk/cmake/withcasa.cmake

@@ -124 +124 @@
 endif()
 message( STATUS "LIBXML2_LIBRARY = " ${LIBXML2_LIBRARY} ) 
-set( ASDM_INCLUDE_DIR_OLD ${CASA_CODE_PATH}/alma/implement/ASDM
-                          ${CASA_CODE_PATH}/alma/implement/Enumerations
-                          ${CASA_CODE_PATH}/alma/implement/ASDMBinaries
-                          ${CASA_CODE_PATH}/alma/implement/Enumtcl
-                          ${LIBXML2_INCLUDE_DIR} )
-set( ASDM_LIBRARY_OLD ${casaroot}/${arch}/lib/libalma${CMAKE_SHARED_LIBRARY_SUFFIX} 
-                      ${LIBXML2_LIBRARY}/libxml2${CMAKE_SHARED_LIBRARY_SUFFIX} )
-set( ASDM_INCLUDE_DIR ${CASA_CODE_PATH}/alma_v3/implement/ASDM
-                      ${CASA_CODE_PATH}/alma_v3/implement/Enumerations
-                      ${CASA_CODE_PATH}/alma_v3/implement/ASDMBinaries
-                      ${CASA_CODE_PATH}/alma_v3/implement/Enumtcl
+#set( ASDM_INCLUDE_DIR_OLD ${CASA_CODE_PATH}/alma/implement/ASDM
+#                          ${CASA_CODE_PATH}/alma/implement/Enumerations
+#                          ${CASA_CODE_PATH}/alma/implement/ASDMBinaries
+#                          ${CASA_CODE_PATH}/alma/implement/Enumtcl
+#                          ${LIBXML2_INCLUDE_DIR} )
+#set( ASDM_LIBRARY_OLD ${casaroot}/${arch}/lib/libalma${CMAKE_SHARED_LIBRARY_SUFFIX} 
+#                      ${LIBXML2_LIBRARY}/libxml2${CMAKE_SHARED_LIBRARY_SUFFIX} )
+#set( ASDM_INCLUDE_DIR ${CASA_CODE_PATH}/alma_v3/implement/ASDM
+#                      ${CASA_CODE_PATH}/alma_v3/implement/Enumerations
+#                      ${CASA_CODE_PATH}/alma_v3/implement/ASDMBinaries
+#                      ${CASA_CODE_PATH}/alma_v3/implement/Enumtcl
+#                      ${LIBXML2_INCLUDE_DIR} )
+#set( ASDM_LIBRARY ${casaroot}/${arch}/lib/libalma_v3${CMAKE_SHARED_LIBRARY_SUFFIX}
+#                  ${LIBXML2_LIBRARY}/libxml2${CMAKE_SHARED_LIBRARY_SUFFIX} )
+set( ASDM_INCLUDE_DIR ${CASA_CODE_PATH}/alma/implement/ASDM
+                      ${CASA_CODE_PATH}/alma/implement/Enumerations
+                      ${CASA_CODE_PATH}/alma/implement/ASDMBinaries
+                      ${CASA_CODE_PATH}/alma/implement/Enumtcl
                       ${LIBXML2_INCLUDE_DIR} )
-set( ASDM_LIBRARY ${casaroot}/${arch}/lib/libalma_v3${CMAKE_SHARED_LIBRARY_SUFFIX}
+set( ASDM_LIBRARY ${casaroot}/${arch}/lib/libalma${CMAKE_SHARED_LIBRARY_SUFFIX}
                   ${LIBXML2_LIBRARY}/libxml2${CMAKE_SHARED_LIBRARY_SUFFIX} )
 add_definitions( -DWITHOUT_ACS )
@@ -157 +164 @@
    add_subdirectory( share )
    add_subdirectory( external-alma/asdm2ASAP )
-   add_subdirectory( external-alma/oldasdm2ASAP ) 
+#   add_subdirectory( external-alma/oldasdm2ASAP ) 
 endmacro( asap_add_subdirectory )