mirror of
https://github.com/qgis/QGIS.git
synced 2025-12-10 00:08:20 -05:00
Use cmake variable rather than env var for QGIS Cmake Find rules when using a custom QGIS prefix.
This commit is contained in:
parent
810edb7f92
commit
e1508c1e6a
@ -84,23 +84,23 @@ ELSE(WIN32)
|
|||||||
FIND_PATH(QGIS_PLUGIN_DIR
|
FIND_PATH(QGIS_PLUGIN_DIR
|
||||||
NAMES libspatialqueryplugin.so
|
NAMES libspatialqueryplugin.so
|
||||||
PATHS
|
PATHS
|
||||||
|
${QGIS_PREFIX_PATH}/lib/qgis/plugins/
|
||||||
/usr/lib64/qgis/plugins
|
/usr/lib64/qgis/plugins
|
||||||
/usr/lib/qgis
|
/usr/lib/qgis
|
||||||
/usr/local/lib/qgis/plugins
|
/usr/local/lib/qgis/plugins
|
||||||
${QGIS_MAC_PATH}/PlugIns/qgis
|
${QGIS_MAC_PATH}/PlugIns/qgis
|
||||||
"$ENV{LIB_DIR}/lib/qgis/plugins"
|
"$ENV{LIB_DIR}/lib/qgis/plugins"
|
||||||
"$ENV{LIB_DIR}/lib/qgis"
|
"$ENV{LIB_DIR}/lib/qgis"
|
||||||
"$ENV{QGIS_PREFIX_PATH}/lib/qgis/plugins/"
|
|
||||||
)
|
)
|
||||||
FIND_PATH(QGIS_INCLUDE_DIR
|
FIND_PATH(QGIS_INCLUDE_DIR
|
||||||
NAMES qgis.h
|
NAMES qgis.h
|
||||||
PATHS
|
PATHS
|
||||||
|
{QGIS_PREFIX_PATH}/include/qgis
|
||||||
/usr/include/qgis
|
/usr/include/qgis
|
||||||
/usr/local/include/qgis
|
/usr/local/include/qgis
|
||||||
/Library/Frameworks/qgis_core.framework/Headers
|
/Library/Frameworks/qgis_core.framework/Headers
|
||||||
${QGIS_MAC_PATH}/Frameworks/qgis_core.framework/Headers
|
${QGIS_MAC_PATH}/Frameworks/qgis_core.framework/Headers
|
||||||
"$ENV{LIB_DIR}/include/qgis"
|
"$ENV{LIB_DIR}/include/qgis"
|
||||||
"$ENV{QGIS_PREFIX_PATH}/include/qgis"
|
|
||||||
)
|
)
|
||||||
# also get other frameworks' headers folders on OS X
|
# also get other frameworks' headers folders on OS X
|
||||||
IF (APPLE)
|
IF (APPLE)
|
||||||
@ -125,34 +125,34 @@ ELSE(WIN32)
|
|||||||
FIND_LIBRARY(QGIS_CORE_LIBRARY
|
FIND_LIBRARY(QGIS_CORE_LIBRARY
|
||||||
NAMES qgis_core
|
NAMES qgis_core
|
||||||
PATHS
|
PATHS
|
||||||
|
${QGIS_PREFIX_PATH}/lib/
|
||||||
/usr/lib64
|
/usr/lib64
|
||||||
/usr/lib
|
/usr/lib
|
||||||
/usr/local/lib
|
/usr/local/lib
|
||||||
/Library/Frameworks
|
/Library/Frameworks
|
||||||
${QGIS_MAC_PATH}/Frameworks
|
${QGIS_MAC_PATH}/Frameworks
|
||||||
"$ENV{QGIS_PREFIX_PATH}/lib/"
|
|
||||||
"$ENV{LIB_DIR}/lib/"
|
"$ENV{LIB_DIR}/lib/"
|
||||||
)
|
)
|
||||||
FIND_LIBRARY(QGIS_GUI_LIBRARY
|
FIND_LIBRARY(QGIS_GUI_LIBRARY
|
||||||
NAMES qgis_gui
|
NAMES qgis_gui
|
||||||
PATHS
|
PATHS
|
||||||
|
${QGIS_PREFIX_PATH}/lib/
|
||||||
/usr/lib64
|
/usr/lib64
|
||||||
/usr/lib
|
/usr/lib
|
||||||
/usr/local/lib
|
/usr/local/lib
|
||||||
/Library/Frameworks
|
/Library/Frameworks
|
||||||
${QGIS_MAC_PATH}/Frameworks
|
${QGIS_MAC_PATH}/Frameworks
|
||||||
"$ENV{QGIS_PREFIX_PATH}/lib/"
|
|
||||||
"$ENV{LIB_DIR}/lib/"
|
"$ENV{LIB_DIR}/lib/"
|
||||||
)
|
)
|
||||||
FIND_LIBRARY(QGIS_ANALYSIS_LIBRARY
|
FIND_LIBRARY(QGIS_ANALYSIS_LIBRARY
|
||||||
NAMES qgis_analysis
|
NAMES qgis_analysis
|
||||||
PATHS
|
PATHS
|
||||||
|
${QGIS_PREFIX_PATH}/lib/
|
||||||
/usr/lib64
|
/usr/lib64
|
||||||
/usr/lib
|
/usr/lib
|
||||||
/usr/local/lib
|
/usr/local/lib
|
||||||
/Library/Frameworks
|
/Library/Frameworks
|
||||||
${QGIS_MAC_PATH}/Frameworks
|
${QGIS_MAC_PATH}/Frameworks
|
||||||
"$ENV{QGIS_PREFIX_PATH}/lib/"
|
|
||||||
"$ENV{LIB_DIR}/lib/"
|
"$ENV{LIB_DIR}/lib/"
|
||||||
)
|
)
|
||||||
ENDIF(UNIX)
|
ENDIF(UNIX)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user