Changes in trunk/cmake/withcasa.cmake [2417:2273]

File:

• trunk/cmake/withcasa.cmake (modified) (4 diffs)

trunk/cmake/withcasa.cmake

@@ -6 +6 @@
 # environment dependent settings
 if( APPLE )
-   if( CMAKE_SYSTEM MATCHES ^Darwin-10 OR
-                CMAKE_SYSTEM MATCHES ^Darwin-11 )
-      if ( NOT arch )
-         set( arch darwin64 )
-      endif()
+   if( NOT arch )
+      set( arch darwin )
+   endif()
+   if( CMAKE_SYSTEM MATCHES ^Darwin-10 )
       if( NOT archflag )
-         if( EXISTS /opt/casa/darwin11 )
-            set( archflag x86_64 )
-         elseif( EXISTS /opt/casa/darwin10-64b )
+         if( EXISTS /opt/casa/darwin10-64b )
             set( archflag x86_64 )
          elseif( EXISTS /opt/casa/core2-apple-darwin10 )
@@ -23 +20 @@
       endif()
       if( archflag STREQUAL x86_64 )
-         if( CMAKE_SYSTEM MATCHES ^Darwin-11 )
-             set( casa_packages /opt/casa/darwin11 )
-         else()
-             set( casa_packages /opt/casa/darwin10-64b )
-         endif()
+         set( casa_packages /opt/casa/darwin10-64b )
       else()
          set( casa_packages /opt/casa/core2-apple-darwin10 )
       endif()
    elseif( CMAKE_SYSTEM MATCHES ^Darwin-9 )
-      if ( NOT arch )
-         set( arch darwin )
-      endif()
       set( casa_packages /opt/casa/core2-apple-darwin8/3rd-party )
    endif()         
@@ -124 +114 @@
 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
-#                      ${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
+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${CMAKE_SHARED_LIBRARY_SUFFIX}
+set( ASDM_LIBRARY ${casaroot}/${arch}/lib/libalma_v3${CMAKE_SHARED_LIBRARY_SUFFIX}
                   ${LIBXML2_LIBRARY}/libxml2${CMAKE_SHARED_LIBRARY_SUFFIX} )
 add_definitions( -DWITHOUT_ACS )
@@ -164 +147 @@
    add_subdirectory( share )
    add_subdirectory( external-alma/asdm2ASAP )
-#   add_subdirectory( external-alma/oldasdm2ASAP ) 
+   add_subdirectory( external-alma/oldasdm2ASAP ) 
 endmacro( asap_add_subdirectory )