Skip to content

Commit 8eef455

Browse files
author
kyngchaos
committedDec 30, 2010
Fix empty _LIBRARY left from framework check when fw not found
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14984 c8812cc2-4d05-0410-92ff-de0c093fc19c

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed
 

‎cmake/FindGDAL.cmake

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,12 @@ ELSE(WIN32)
135135
ENDIF (GDAL_LIB_NAME_WITH_PREFIX)
136136

137137
IF (APPLE)
138-
SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.dylib CACHE STRING INTERNAL)
138+
IF (NOT GDAL_LIBRARY)
139+
# work around empty GDAL_LIBRARY left by framework check
140+
# while still preserving user setting if given
141+
# ***FIXME*** need to improve framework check so below not needed
142+
SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.dylib CACHE STRING INTERNAL FORCE)
143+
ENDIF (NOT GDAL_LIBRARY)
139144
ELSE (APPLE)
140145
SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.so CACHE STRING INTERNAL)
141146
ENDIF (APPLE)

‎cmake/FindGEOS.cmake

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,12 @@ ELSE(WIN32)
132132
#MESSAGE("DBG GEOS_LIB_NAME=${GEOS_LIB_NAME}")
133133

134134
IF (APPLE)
135-
SET(GEOS_LIBRARY ${GEOS_LINK_DIRECTORIES}/lib${GEOS_LIB_NAME}.dylib CACHE STRING INTERNAL)
135+
IF (NOT GEOS_LIBRARY)
136+
# work around empty GEOS_LIBRARY left by framework check
137+
# while still preserving user setting if given
138+
# ***FIXME*** need to improve framework check so below not needed
139+
SET(GEOS_LIBRARY ${GEOS_LINK_DIRECTORIES}/lib${GEOS_LIB_NAME}.dylib CACHE STRING INTERNAL FORCE)
140+
ENDIF (NOT GEOS_LIBRARY)
136141
ELSE (APPLE)
137142
SET(GEOS_LIBRARY ${GEOS_LINK_DIRECTORIES}/lib${GEOS_LIB_NAME}.so CACHE STRING INTERNAL)
138143
ENDIF (APPLE)

0 commit comments

Comments
 (0)
Please sign in to comment.