Skip to content

Commit 939f65c

Browse files
committed
find qgis frameworks in /Library/Frameworks first
1 parent c6a1800 commit 939f65c

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

cmake/FindQGIS.cmake

+10-2
Original file line numberDiff line numberDiff line change
@@ -96,18 +96,23 @@ ELSE(WIN32)
9696
PATHS
9797
/usr/include/qgis
9898
/usr/local/include/qgis
99+
/Library/Frameworks/qgis_core.framework/Headers
99100
${QGIS_MAC_PATH}/Frameworks/qgis_core.framework/Headers
100101
"$ENV{LIB_DIR}/include/qgis"
101102
)
102103
# also get other frameworks' headers folders on OS X
103104
IF (APPLE)
104105
FIND_PATH(QGIS_GUI_INCLUDE_DIR
105106
NAMES qgisgui.h
106-
PATHS ${QGIS_MAC_PATH}/Frameworks/qgis_gui.framework/Headers
107+
PATHS
108+
/Library/Frameworks/qgis_core.framework/Headers
109+
${QGIS_MAC_PATH}/Frameworks/qgis_gui.framework/Headers
107110
)
108111
FIND_PATH(QGIS_ANALYSIS_INCLUDE_DIR
109112
NAMES qgsinterpolator.h
110-
PATHS ${QGIS_MAC_PATH}/Frameworks/qgis_analysis.framework/Headers
113+
PATHS
114+
/Library/Frameworks/qgis_analysis.framework/Headers
115+
${QGIS_MAC_PATH}/Frameworks/qgis_analysis.framework/Headers
111116
)
112117
SET(QGIS_INCLUDE_DIR
113118
${QGIS_INCLUDE_DIR}
@@ -121,6 +126,7 @@ ELSE(WIN32)
121126
/usr/lib64
122127
/usr/lib
123128
/usr/local/lib
129+
/Library/Frameworks
124130
${QGIS_MAC_PATH}/Frameworks
125131
"$ENV{LIB_DIR}/lib/"
126132
)
@@ -130,6 +136,7 @@ ELSE(WIN32)
130136
/usr/lib64
131137
/usr/lib
132138
/usr/local/lib
139+
/Library/Frameworks
133140
${QGIS_MAC_PATH}/Frameworks
134141
"$ENV{LIB_DIR}/lib/"
135142
)
@@ -139,6 +146,7 @@ ELSE(WIN32)
139146
/usr/lib64
140147
/usr/lib
141148
/usr/local/lib
149+
/Library/Frameworks
142150
${QGIS_MAC_PATH}/Frameworks
143151
"$ENV{LIB_DIR}/lib/"
144152
)

0 commit comments

Comments
 (0)