mirror of
https://github.com/qgis/QGIS.git
synced 2025-10-07 00:15:48 -04:00
Fix GDAL discover on non-Apple
git-svn-id: http://svn.osgeo.org/qgis/trunk@6692 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
parent
a3181a3be5
commit
297fe1db7d
@ -75,8 +75,8 @@ ELSE(WIN32)
|
|||||||
|
|
||||||
IF (APPLE)
|
IF (APPLE)
|
||||||
SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.dylib CACHE STRING INTERNAL)
|
SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.dylib CACHE STRING INTERNAL)
|
||||||
ELSEIF (APPLE)
|
ELSE (APPLE)
|
||||||
SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.so CACHE STRING INTERNAL)
|
SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.so CACHE STRING INTERNAL)
|
||||||
ENDIF (APPLE)
|
ENDIF (APPLE)
|
||||||
|
|
||||||
ELSE(GDAL_CONFIG)
|
ELSE(GDAL_CONFIG)
|
||||||
@ -99,8 +99,8 @@ IF (GDAL_FOUND)
|
|||||||
|
|
||||||
ELSE (GDAL_FOUND)
|
ELSE (GDAL_FOUND)
|
||||||
|
|
||||||
IF (GDAL_FIND_REQUIRED)
|
MESSAGE(GDAL_INCLUDE_DIR=${GDAL_INCLUDE_DIR})
|
||||||
MESSAGE(FATAL_ERROR "Could not find GDAL")
|
MESSAGE(GDAL_LIBRARY=${GDAL_LIBRARY})
|
||||||
ENDIF (GDAL_FIND_REQUIRED)
|
MESSAGE(FATAL_ERROR "Could not find GDAL")
|
||||||
|
|
||||||
ENDIF (GDAL_FOUND)
|
ENDIF (GDAL_FOUND)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user