Ticket #31034: patch-findgdal.diff

cmake/FindGDAL.cmake

@@ -38 +38 @@
 ELSE(WIN32)
   IF(UNIX) 
 
-    # try to use framework on mac
-    # want clean framework path, not unix compatibility path
-    IF (APPLE)
-      IF (CMAKE_FIND_FRAMEWORK MATCHES "FIRST"
-          OR CMAKE_FRAMEWORK_PATH MATCHES "ONLY"
-          OR NOT CMAKE_FIND_FRAMEWORK)
-        SET (CMAKE_FIND_FRAMEWORK_save ${CMAKE_FIND_FRAMEWORK} CACHE STRING "" FORCE)
-        SET (CMAKE_FIND_FRAMEWORK "ONLY" CACHE STRING "" FORCE)
-        FIND_LIBRARY(GDAL_LIBRARY GDAL)
-        IF (GDAL_LIBRARY)
-          # they're all the same in a framework
-          SET (GDAL_INCLUDE_DIR ${GDAL_LIBRARY}/Headers CACHE PATH "Path to a file.")
-          # set GDAL_CONFIG to make later test happy, not used here, may not exist
-          SET (GDAL_CONFIG ${GDAL_LIBRARY}/unix/bin/gdal-config CACHE FILEPATH "Path to a program.")
-          # version in info.plist
-          GET_VERSION_PLIST (${GDAL_LIBRARY}/Resources/Info.plist GDAL_VERSION)
-          IF (NOT GDAL_VERSION)
-            MESSAGE (FATAL_ERROR "Could not determine GDAL version from framework.")
-          ENDIF (NOT GDAL_VERSION)
-          STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1" GDAL_VERSION_MAJOR "${GDAL_VERSION}")
-          STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\2" GDAL_VERSION_MINOR "${GDAL_VERSION}")
-          IF (GDAL_VERSION_MAJOR LESS 1 OR GDAL_VERSION_MINOR LESS 4)
-            MESSAGE (FATAL_ERROR "GDAL version is too old (${GDAL_VERSION}). Use 1.4.0 or higher.")
-          ENDIF (GDAL_VERSION_MAJOR LESS 1 OR GDAL_VERSION_MINOR LESS 4)
-        ENDIF (GDAL_LIBRARY)
-        SET (CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK_save} CACHE STRING "" FORCE)
-      ENDIF ()
-    ENDIF (APPLE)
-
     IF (NOT GDAL_INCLUDE_DIR OR NOT GDAL_LIBRARY OR NOT GDAL_CONFIG)
       # didn't find OS X framework, and was not set by user
       SET(GDAL_CONFIG_PREFER_PATH "$ENV{GDAL_HOME}/bin" CACHE STRING "preferred path to GDAL (gdal-config)")
@@ -146 +117 @@
           STRING(REGEX REPLACE "[-][l]" "" GDAL_LIB_NAME ${GDAL_LIB_NAME_WITH_PREFIX} )
         ENDIF (GDAL_LIB_NAME_WITH_PREFIX)
 
-        IF (APPLE)
-          IF (NOT GDAL_LIBRARY)
-            # work around empty GDAL_LIBRARY left by framework check
-            # while still preserving user setting if given
-            # ***FIXME*** need to improve framework check so below not needed
-            SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.dylib CACHE STRING INTERNAL FORCE)
-          ENDIF (NOT GDAL_LIBRARY)
-        ELSE (APPLE)
-          SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.so CACHE STRING INTERNAL)
-        ENDIF (APPLE)
-      
       ELSE(GDAL_CONFIG)
         MESSAGE("FindGDAL.cmake: gdal-config not found. Please set it manually. GDAL_CONFIG=${GDAL_CONFIG}")
       ENDIF(GDAL_CONFIG)