From e1508c1e6ac52e3a6f3367aad8233714dea39a6c Mon Sep 17 00:00:00 2001
From: Tim Sutton <tim@kartoza.com>
Date: Thu, 19 Feb 2015 23:17:37 +0200
Subject: [PATCH] Use cmake variable rather than env var for QGIS Cmake Find
 rules when using a custom QGIS prefix.

---
 cmake/FindQGIS.cmake | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/cmake/FindQGIS.cmake b/cmake/FindQGIS.cmake
index 5bc168aacea..4eef01f92e9 100644
--- a/cmake/FindQGIS.cmake
+++ b/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)