Merge pull request #1861 from timlinux/master

timlinux · timlinux · commit 34a6a368a8cd · 2015-02-20T10:42:54.000+02:00
This PR will allow FindQGIS.cmake to find QGIS libs/includes in QGIS_PREFIX_PATH too
diff --git a/cmake/FindQGIS.cmake b/cmake/FindQGIS.cmake
@@ -84,6 +84,7 @@ 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
@@ -94,6 +95,7 @@ ELSE(WIN32)
     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
@@ -123,6 +125,7 @@ ELSE(WIN32)
     FIND_LIBRARY(QGIS_CORE_LIBRARY
       NAMES qgis_core
       PATHS
+        ${QGIS_PREFIX_PATH}/lib/
         /usr/lib64
         /usr/lib
         /usr/local/lib
@@ -133,6 +136,7 @@ ELSE(WIN32)
     FIND_LIBRARY(QGIS_GUI_LIBRARY
       NAMES qgis_gui
       PATHS
+        ${QGIS_PREFIX_PATH}/lib/
         /usr/lib64
         /usr/lib
         /usr/local/lib
@@ -143,6 +147,7 @@ ELSE(WIN32)
     FIND_LIBRARY(QGIS_ANALYSIS_LIBRARY
       NAMES qgis_analysis
       PATHS
+        ${QGIS_PREFIX_PATH}/lib/
         /usr/lib64
         /usr/lib
         /usr/local/lib
