[QGIS Commit] r14984 - trunk/qgis/cmake

[svn_qgis at osgeo.org]

Author: kyngchaos
Date: 2010-12-30 15:45:23 -0800 (Thu, 30 Dec 2010)
New Revision: 14984

Modified:
   trunk/qgis/cmake/FindGDAL.cmake
   trunk/qgis/cmake/FindGEOS.cmake
Log:
Fix empty _LIBRARY left from framework check when fw not found

Modified: trunk/qgis/cmake/FindGDAL.cmake
===================================================================
--- trunk/qgis/cmake/FindGDAL.cmake	2010-12-30 15:36:30 UTC (rev 14983)
+++ trunk/qgis/cmake/FindGDAL.cmake	2010-12-30 23:45:23 UTC (rev 14984)
@@ -135,7 +135,12 @@
         ENDIF (GDAL_LIB_NAME_WITH_PREFIX)
 
         IF (APPLE)
-          SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.dylib CACHE STRING INTERNAL)
+          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)

Modified: trunk/qgis/cmake/FindGEOS.cmake
===================================================================
--- trunk/qgis/cmake/FindGEOS.cmake	2010-12-30 15:36:30 UTC (rev 14983)
+++ trunk/qgis/cmake/FindGEOS.cmake	2010-12-30 23:45:23 UTC (rev 14984)
@@ -132,7 +132,12 @@
         #MESSAGE("DBG  GEOS_LIB_NAME=${GEOS_LIB_NAME}")
 
         IF (APPLE)
-          SET(GEOS_LIBRARY ${GEOS_LINK_DIRECTORIES}/lib${GEOS_LIB_NAME}.dylib CACHE STRING INTERNAL)
+          IF (NOT GEOS_LIBRARY)
+            # work around empty GEOS_LIBRARY left by framework check
+            # while still preserving user setting if given
+            # ***FIXME*** need to improve framework check so below not needed
+            SET(GEOS_LIBRARY ${GEOS_LINK_DIRECTORIES}/lib${GEOS_LIB_NAME}.dylib CACHE STRING INTERNAL FORCE)
+          ENDIF (NOT GEOS_LIBRARY)
         ELSE (APPLE)
           SET(GEOS_LIBRARY ${GEOS_LINK_DIRECTORIES}/lib${GEOS_LIB_NAME}.so CACHE STRING INTERNAL)
         ENDIF (APPLE)