File tree Expand file tree Collapse file tree 2 files changed +12
-2
lines changed Expand file tree Collapse file tree 2 files changed +12
-2
lines changed Original file line number Diff line number Diff line change @@ -135,7 +135,12 @@ ELSE(WIN32)
135
135
ENDIF (GDAL_LIB_NAME_WITH_PREFIX )
136
136
137
137
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 )
139
144
ELSE (APPLE )
140
145
SET (GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES} /lib${GDAL_LIB_NAME}.so CACHE STRING INTERNAL )
141
146
ENDIF (APPLE )
Original file line number Diff line number Diff line change @@ -132,7 +132,12 @@ ELSE(WIN32)
132
132
#MESSAGE("DBG GEOS_LIB_NAME=${GEOS_LIB_NAME}")
133
133
134
134
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 )
136
141
ELSE (APPLE )
137
142
SET (GEOS_LIBRARY ${GEOS_LINK_DIRECTORIES} /lib${GEOS_LIB_NAME}.so CACHE STRING INTERNAL )
138
143
ENDIF (APPLE )
You can’t perform that action at this time.
0 commit comments