From 939f65cc1c81602b34f33dd59d79af813cc7ce2c Mon Sep 17 00:00:00 2001
From: William Kyngesburye <kyngchaos@kyngchaos.com>
Date: Mon, 15 Aug 2011 20:45:59 -0500
Subject: [PATCH] find qgis frameworks in /Library/Frameworks first

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

diff --git a/cmake/FindQGIS.cmake b/cmake/FindQGIS.cmake
index 5714d81b77c5..ed7ce45e85a0 100644
--- a/cmake/FindQGIS.cmake
+++ b/cmake/FindQGIS.cmake
@@ -96,6 +96,7 @@ ELSE(WIN32)
       PATHS
         /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"
     )
@@ -103,11 +104,15 @@ ELSE(WIN32)
     IF (APPLE)
       FIND_PATH(QGIS_GUI_INCLUDE_DIR
         NAMES qgisgui.h
-        PATHS ${QGIS_MAC_PATH}/Frameworks/qgis_gui.framework/Headers
+        PATHS
+          /Library/Frameworks/qgis_core.framework/Headers
+          ${QGIS_MAC_PATH}/Frameworks/qgis_gui.framework/Headers
       )
       FIND_PATH(QGIS_ANALYSIS_INCLUDE_DIR
         NAMES qgsinterpolator.h
-        PATHS ${QGIS_MAC_PATH}/Frameworks/qgis_analysis.framework/Headers
+        PATHS
+          /Library/Frameworks/qgis_analysis.framework/Headers
+          ${QGIS_MAC_PATH}/Frameworks/qgis_analysis.framework/Headers
       )
       SET(QGIS_INCLUDE_DIR
         ${QGIS_INCLUDE_DIR}
@@ -121,6 +126,7 @@ ELSE(WIN32)
         /usr/lib64
         /usr/lib
         /usr/local/lib
+        /Library/Frameworks
         ${QGIS_MAC_PATH}/Frameworks
         "$ENV{LIB_DIR}/lib/"
     )
@@ -130,6 +136,7 @@ ELSE(WIN32)
         /usr/lib64
         /usr/lib
         /usr/local/lib
+        /Library/Frameworks
         ${QGIS_MAC_PATH}/Frameworks
         "$ENV{LIB_DIR}/lib/"
     )
@@ -139,6 +146,7 @@ ELSE(WIN32)
         /usr/lib64
         /usr/lib
         /usr/local/lib
+        /Library/Frameworks
         ${QGIS_MAC_PATH}/Frameworks
         "$ENV{LIB_DIR}/lib/"
     )