@@ -133,24 +133,27 @@ FUNCTION (UPDATEQGISPATHS LIBFROM LIBTO)
133
133
FOREACH (QL ${QGFWLIST} )
134
134
INSTALLNAMETOOL_CHANGE ("${LIBFROM} " "${LIB_CHG_TO} " "${QFWDIR} /${QL} .framework/${QL} " )
135
135
ENDFOREACH (QL)
136
- # libqgispython and libqgis_server are not frameworks
136
+ # non-framework qgis libs
137
137
IF (${OSX_HAVE_LOADERPATH} )
138
138
SET (LIB_CHG_TO "${ATLOADER} /${QGIS_LIB_SUBDIR_REV} /${LIBMID} /${LIBPOST} " )
139
139
ENDIF ()
140
- INSTALLNAMETOOL_CHANGE ("${LIBFROM} " "${LIB_CHG_TO} " "${QLIBDIR} /libqgispython.dylib" )
141
- INSTALLNAMETOOL_CHANGE ("${LIBFROM} " "${LIB_CHG_TO} " "${QLIBDIR} /libqgis_server.dylib" )
140
+ FOREACH (QL ${QGLIBLIST} )
141
+ INSTALLNAMETOOL_CHANGE ("${LIBFROM} " "${LIB_CHG_TO} " "${QLIBDIR} /${QL} " )
142
+ ENDFOREACH (QL)
142
143
# crssync
143
144
IF (${OSX_HAVE_LOADERPATH} )
144
145
SET (LIB_CHG_TO "${ATEXECUTABLE} /${QGIS_LIBEXEC_SUBDIR_REV} /${LIBMID} /${LIBPOST} " )
145
146
ENDIF ()
146
147
INSTALLNAMETOOL_CHANGE ("${LIBFROM} " "${LIB_CHG_TO} " "${QLIBXDIR} /crssync" )
147
148
# GRASS libexec stuff
148
- IF (EXISTS "${QLIBXDIR} /grass/bin/qgis.g.browser" )
149
- IF (${OSX_HAVE_LOADERPATH} )
150
- SET (LIB_CHG_TO "${ATLOADER} /../../${QGIS_LIBEXEC_SUBDIR_REV} /${LIBMID} /${LIBPOST} " )
149
+ FOREACH (QG ${QGRASSEXECLIST} )
150
+ IF (EXISTS "${QLIBXDIR} /grass/${QG} " )
151
+ IF (${OSX_HAVE_LOADERPATH} )
152
+ SET (LIB_CHG_TO "${ATLOADER} /../../${QGIS_LIBEXEC_SUBDIR_REV} /${LIBMID} /${LIBPOST} " )
153
+ ENDIF ()
154
+ INSTALLNAMETOOL_CHANGE ("${LIBFROM} " "${LIB_CHG_TO} " "${QLIBXDIR} /grass/${QG} " )
151
155
ENDIF ()
152
- INSTALLNAMETOOL_CHANGE ("${LIBFROM} " "${LIB_CHG_TO} " "${QLIBXDIR} /grass/bin/qgis.g.browser" )
153
- ENDIF ()
156
+ ENDFOREACH (QG)
154
157
# plugins
155
158
IF (${OSX_HAVE_LOADERPATH} )
156
159
SET (LIB_CHG_TO "${ATLOADER} /${QGIS_PLUGIN_SUBDIR_REV} /${LIBMID} /${LIBPOST} " )
@@ -203,8 +206,9 @@ FILE (GLOB QGFWLIST RELATIVE "${QFWDIR}" "${QFWDIR}/qgis*.framework")
203
206
STRING (REPLACE ".framework" ";" QGFWLIST ${QGFWLIST} )
204
207
# don't collect any library symlinks, limit to versioned libs
205
208
SET (Q_LIBVER ${CPACK_PACKAGE_VERSION_MAJOR} .${CPACK_PACKAGE_VERSION_MINOR} )
206
- FILE (GLOB QGLIBLIST RELATIVE "${QLIBDIR} " "${QLIBDIR} /libqgis*.${Q_LIBVER} *. dylib" )
209
+ FILE (GLOB QGLIBLIST RELATIVE "${QLIBDIR} " "${QLIBDIR} /libqgis*.dylib" )
207
210
FILE (GLOB QGPLUGLIST "${QPLUGDIR} /*.so" )
208
211
FILE (GLOB QGPYLIST "${QGISPYDIR} /qgis/*.so" )
209
212
FILE (GLOB QGAPPLIST RELATIVE "${QBINDIR} " "${QBINDIR} /q*.app" )
213
+ FILE (GLOB QGRASSEXECLIST RELATIVE "${QLIBXDIR} /grass" "${QLIBXDIR} /grass/*/*" )
210
214
STRING (REPLACE ".app" ";" QGAPPLIST ${QGAPPLIST} )
0 commit comments