find qgis frameworks in /Library/Frameworks first

qgis · Aug 16, 2011 · 939f65c · 939f65c
1 parent c6a1800
commit 939f65c
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/cmake/FindQGIS.cmake b/cmake/FindQGIS.cmake
@@ -96,18 +96,23 @@ 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"
     )
     # also get other frameworks' headers folders on OS X
     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/"
     )