Skip to content
Permalink
Browse files

Use cmake variable rather than env var for QGIS Cmake Find rules when…

… using a custom QGIS prefix.
  • Loading branch information
timlinux committed Feb 19, 2015
1 parent 810edb7 commit e1508c1e6ac52e3a6f3367aad8233714dea39a6c
Showing with 5 additions and 5 deletions.
  1. +5 −5 cmake/FindQGIS.cmake
@@ -84,23 +84,23 @@ ELSE(WIN32)
FIND_PATH(QGIS_PLUGIN_DIR
NAMES libspatialqueryplugin.so
PATHS
${QGIS_PREFIX_PATH}/lib/qgis/plugins/
/usr/lib64/qgis/plugins
/usr/lib/qgis
/usr/local/lib/qgis/plugins
${QGIS_MAC_PATH}/PlugIns/qgis
"$ENV{LIB_DIR}/lib/qgis/plugins"
"$ENV{LIB_DIR}/lib/qgis"
"$ENV{QGIS_PREFIX_PATH}/lib/qgis/plugins/"
)
FIND_PATH(QGIS_INCLUDE_DIR
NAMES qgis.h
PATHS
{QGIS_PREFIX_PATH}/include/qgis
/usr/include/qgis
/usr/local/include/qgis
/Library/Frameworks/qgis_core.framework/Headers
${QGIS_MAC_PATH}/Frameworks/qgis_core.framework/Headers
"$ENV{LIB_DIR}/include/qgis"
"$ENV{QGIS_PREFIX_PATH}/include/qgis"
)
# also get other frameworks' headers folders on OS X
IF (APPLE)
@@ -125,34 +125,34 @@ ELSE(WIN32)
FIND_LIBRARY(QGIS_CORE_LIBRARY
NAMES qgis_core
PATHS
${QGIS_PREFIX_PATH}/lib/
/usr/lib64
/usr/lib
/usr/local/lib
/Library/Frameworks
${QGIS_MAC_PATH}/Frameworks
"$ENV{QGIS_PREFIX_PATH}/lib/"
"$ENV{LIB_DIR}/lib/"
)
FIND_LIBRARY(QGIS_GUI_LIBRARY
NAMES qgis_gui
PATHS
${QGIS_PREFIX_PATH}/lib/
/usr/lib64
/usr/lib
/usr/local/lib
/Library/Frameworks
${QGIS_MAC_PATH}/Frameworks
"$ENV{QGIS_PREFIX_PATH}/lib/"
"$ENV{LIB_DIR}/lib/"
)
FIND_LIBRARY(QGIS_ANALYSIS_LIBRARY
NAMES qgis_analysis
PATHS
${QGIS_PREFIX_PATH}/lib/
/usr/lib64
/usr/lib
/usr/local/lib
/Library/Frameworks
${QGIS_MAC_PATH}/Frameworks
"$ENV{QGIS_PREFIX_PATH}/lib/"
"$ENV{LIB_DIR}/lib/"
)
ENDIF(UNIX)

0 comments on commit e1508c1

Please sign in to comment.
You can’t perform that action at this time.