Skip to content
Permalink
Browse files

fix detection logic, remove unused setting

git-svn-id: http://svn.osgeo.org/qgis/trunk@14460 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
kyngchaos
kyngchaos committed Oct 30, 2010
1 parent 16a440e commit a0775278764f9b401a19493eb7576477ade92b54
Showing with 4 additions and 5 deletions.
  1. +2 −2 cmake/FindGDAL.cmake
  2. +2 −2 cmake/FindGEOS.cmake
  3. +0 −1 cmake/FindGSL.cmake
@@ -55,7 +55,7 @@ ELSE(WIN32)
ENDIF ()
ENDIF (APPLE)

IF (NOT GDAL_INCLUDE_DIR AND NOT GDAL_LIBRARY AND NOT GDAL_CONFIG)
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)")
SET(GDAL_CONFIG_PREFER_FWTOOLS_PATH "$ENV{FWTOOLS_HOME}/bin_safe" CACHE STRING "preferred path to GDAL (gdal-config) from FWTools")
@@ -143,7 +143,7 @@ ELSE(WIN32)
ELSE(GDAL_CONFIG)
MESSAGE("FindGDAL.cmake: gdal-config not found. Please set it manually. GDAL_CONFIG=${GDAL_CONFIG}")
ENDIF(GDAL_CONFIG)
ENDIF (NOT GDAL_INCLUDE_DIR AND NOT GDAL_LIBRARY AND NOT GDAL_CONFIG)
ENDIF (NOT GDAL_INCLUDE_DIR OR NOT GDAL_LIBRARY OR NOT GDAL_CONFIG)
ENDIF(UNIX)
ENDIF(WIN32)

@@ -60,7 +60,7 @@ ELSE(WIN32)
ENDIF ()
ENDIF (APPLE)

IF (NOT GEOS_INCLUDE_DIR AND NOT GEOS_LIBRARY AND NOT GEOS_CONFIG)
IF (NOT GEOS_INCLUDE_DIR OR NOT GEOS_LIBRARY OR NOT GEOS_CONFIG)
# didn't find OS X framework, and was not set by user
SET(GEOS_CONFIG_PREFER_PATH "$ENV{GEOS_HOME}/bin" CACHE STRING "preferred path to GEOS (geos-config)")
FIND_PROGRAM(GEOS_CONFIG geos-config
@@ -141,7 +141,7 @@ ELSE(WIN32)
ELSE(GEOS_CONFIG)
MESSAGE("FindGEOS.cmake: geos-config not found. Please set it manually. GEOS_CONFIG=${GEOS_CONFIG}")
ENDIF(GEOS_CONFIG)
ENDIF(NOT GEOS_INCLUDE_DIR AND NOT GEOS_LIBRARY AND NOT GEOS_CONFIG)
ENDIF(NOT GEOS_INCLUDE_DIR OR NOT GEOS_LIBRARY OR NOT GEOS_CONFIG)
ENDIF(UNIX)
ENDIF(WIN32)

@@ -60,7 +60,6 @@ ELSE(WIN32)
FIND_LIBRARY(GSL_LIBRARIES GSL)
IF (GSL_LIBRARIES)
# they're all the same in a framework
SET (GSL_PREFIX ${GSL_LIBRARIES})
SET (GSL_INCLUDE_DIR ${GSL_LIBRARIES}/Headers CACHE PATH "Path to GSL header files.")
SET (GSL_CONFIG ${GSL_LIBRARIES}/Programs/gsl-config CACHE FILEPATH "Path to gsl-config.")
ENDIF (GSL_LIBRARIES)

0 comments on commit a077527

Please sign in to comment.
You can’t perform that action at this time.