Changeset 3006 for trunk


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

Legend:

Unmodified
Added
Removed
  • trunk/CMakeLists.txt

    r3005 r3006  
    9898                CMAKE_SYSTEM MATCHES ^Darwin-11 )
    9999      if( NOT archflag )
    100          if( EXISTS /opt/casa/darwin11 )
     100         if( EXISTS /opt/casa/01 )
     101            set( archflag x86_64 )
     102         elseif( EXISTS /opt/casa/darwin11 )
    101103            set( archflag x86_64 )
    102104         elseif( EXISTS /opt/casa/darwin10-64b )
     
    189191   set( CASACORE_LIBS casa
    190192                      coordinates
     193                      components
    191194                      fits
    192195                      images
  • trunk/cmake/withcasa.cmake

    r2982 r3006  
    1313      endif()
    1414      if( NOT archflag )
    15          if( EXISTS /opt/casa/darwin12 )
     15         if( EXISTS /opt/casa/01 )
     16            set( archflag x86_64 )
     17         elseif( EXISTS /opt/casa/darwin12 )
    1618            set( archflag x86_64 )
    1719         elseif( EXISTS /opt/casa/darwin11 )
     
    148150#
    149151find_path( LIBXML2_INCLUDE_DIR libxml/xmlversion.h
    150   HINTS ${LIBXML2_ROOT_DIR}/include
     152           HINTS ${LIBXML2_ROOT_DIR}/include
    151153           PATH_SUFFIXES libxml2 )
    152154if( LIBXML2_INCLUDE_DIR MATCHES "NOTFOUND$" )
     
    155157message( STATUS "LIBXML2_INCLUDE_DIR = " ${LIBXML2_INCLUDE_DIR} )
    156158find_path( LIBXML2_LIBRARY libxml2${CMAKE_SHARED_LIBRARY_SUFFIX}
    157   HINTS ${LIBXML2_ROOT_DIR}
     159           HINTS ${LIBXML2_ROOT_DIR}
    158160           PATHS /usr
    159161           PATH_SUFFIXES lib64 lib lib/x86_64-linux-gnu)
Note: See TracChangeset for help on using the changeset viewer.