Changeset 3006 for trunk

Timestamp:

10/16/14 12:52:07 (10 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): cmake build scripts

Description: Applied a patch sent from Darrell on Sep. 12, 2014 to support building on the latest version of OSX.

Location:

trunk

Files:

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

trunk/CMakeLists.txt

@@ -98 +98 @@
                 CMAKE_SYSTEM MATCHES ^Darwin-11 )
       if( NOT archflag )
-         if( EXISTS /opt/casa/darwin11 )
+         if( EXISTS /opt/casa/01 )
+            set( archflag x86_64 )
+         elseif( EXISTS /opt/casa/darwin11 )
             set( archflag x86_64 )
          elseif( EXISTS /opt/casa/darwin10-64b )
@@ -189 +191 @@
    set( CASACORE_LIBS casa
                       coordinates
+                      components
                       fits
                       images

trunk/cmake/withcasa.cmake

@@ -13 +13 @@
       endif()
       if( NOT archflag )
-         if( EXISTS /opt/casa/darwin12 )
+         if( EXISTS /opt/casa/01 )
+            set( archflag x86_64 )
+         elseif( EXISTS /opt/casa/darwin12 )
             set( archflag x86_64 )
          elseif( EXISTS /opt/casa/darwin11 )
@@ -148 +150 @@
 #
 find_path( LIBXML2_INCLUDE_DIR libxml/xmlversion.h 
-  HINTS ${LIBXML2_ROOT_DIR}/include
+           HINTS ${LIBXML2_ROOT_DIR}/include
            PATH_SUFFIXES libxml2 )
 if( LIBXML2_INCLUDE_DIR MATCHES "NOTFOUND$" )
@@ -155 +157 @@
 message( STATUS "LIBXML2_INCLUDE_DIR = " ${LIBXML2_INCLUDE_DIR} )
 find_path( LIBXML2_LIBRARY libxml2${CMAKE_SHARED_LIBRARY_SUFFIX}
-  HINTS ${LIBXML2_ROOT_DIR}
+           HINTS ${LIBXML2_ROOT_DIR}
            PATHS /usr
            PATH_SUFFIXES lib64 lib lib/x86_64-linux-gnu)