Added support for finding QGIS in QGIS_PREFIX_PATH when using FindQGI…

…S.cmake
qgis · Feb 19, 2015 · 810edb7 · 810edb7
1 parent 7fff6aa
commit 810edb7
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/cmake/FindQGIS.cmake b/cmake/FindQGIS.cmake
@@ -90,6 +90,7 @@ ELSE(WIN32)
         ${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
@@ -99,6 +100,7 @@ ELSE(WIN32)
         /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)
@@ -128,6 +130,7 @@ ELSE(WIN32)
         /usr/local/lib
         /Library/Frameworks
         ${QGIS_MAC_PATH}/Frameworks
+        "$ENV{QGIS_PREFIX_PATH}/lib/"
         "$ENV{LIB_DIR}/lib/"
     )
     FIND_LIBRARY(QGIS_GUI_LIBRARY
@@ -138,6 +141,7 @@ ELSE(WIN32)
         /usr/local/lib
         /Library/Frameworks
         ${QGIS_MAC_PATH}/Frameworks
+        "$ENV{QGIS_PREFIX_PATH}/lib/"
         "$ENV{LIB_DIR}/lib/"
     )
     FIND_LIBRARY(QGIS_ANALYSIS_LIBRARY
@@ -148,6 +152,7 @@ ELSE(WIN32)
         /usr/local/lib
         /Library/Frameworks
         ${QGIS_MAC_PATH}/Frameworks
+        "$ENV{QGIS_PREFIX_PATH}/lib/"
         "$ENV{LIB_DIR}/lib/"
     )
   ENDIF(UNIX)