[QGIS Commit] r14460 - trunk/qgis/cmake

[svn_qgis at osgeo.org]

Author: kyngchaos
Date: 2010-10-30 15:54:08 -0700 (Sat, 30 Oct 2010)
New Revision: 14460

Modified:
   trunk/qgis/cmake/FindGDAL.cmake
   trunk/qgis/cmake/FindGEOS.cmake
   trunk/qgis/cmake/FindGSL.cmake
Log:
fix detection logic, remove unused setting

Modified: trunk/qgis/cmake/FindGDAL.cmake
===================================================================
--- trunk/qgis/cmake/FindGDAL.cmake	2010-10-30 20:58:41 UTC (rev 14459)
+++ trunk/qgis/cmake/FindGDAL.cmake	2010-10-30 22:54:08 UTC (rev 14460)
@@ -55,7 +55,7 @@
       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(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)
 

Modified: trunk/qgis/cmake/FindGEOS.cmake
===================================================================
--- trunk/qgis/cmake/FindGEOS.cmake	2010-10-30 20:58:41 UTC (rev 14459)
+++ trunk/qgis/cmake/FindGEOS.cmake	2010-10-30 22:54:08 UTC (rev 14460)
@@ -60,7 +60,7 @@
       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(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)
 

Modified: trunk/qgis/cmake/FindGSL.cmake
===================================================================
--- trunk/qgis/cmake/FindGSL.cmake	2010-10-30 20:58:41 UTC (rev 14459)
+++ trunk/qgis/cmake/FindGSL.cmake	2010-10-30 22:54:08 UTC (rev 14460)
@@ -60,7 +60,6 @@
         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)