Skip to content

Commit a1c1949

Browse files
committed
update Mac bundling for GRASS 6/7 lib split
1 parent 4f27e73 commit a1c1949

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

cmake/MacBundleMacros.cmake

+13-9
Original file line numberDiff line numberDiff line change
@@ -133,24 +133,27 @@ FUNCTION (UPDATEQGISPATHS LIBFROM LIBTO)
133133
FOREACH (QL ${QGFWLIST})
134134
INSTALLNAMETOOL_CHANGE ("${LIBFROM}" "${LIB_CHG_TO}" "${QFWDIR}/${QL}.framework/${QL}")
135135
ENDFOREACH (QL)
136-
# libqgispython and libqgis_server are not frameworks
136+
# non-framework qgis libs
137137
IF (${OSX_HAVE_LOADERPATH})
138138
SET (LIB_CHG_TO "${ATLOADER}/${QGIS_LIB_SUBDIR_REV}/${LIBMID}/${LIBPOST}")
139139
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)
142143
# crssync
143144
IF (${OSX_HAVE_LOADERPATH})
144145
SET (LIB_CHG_TO "${ATEXECUTABLE}/${QGIS_LIBEXEC_SUBDIR_REV}/${LIBMID}/${LIBPOST}")
145146
ENDIF ()
146147
INSTALLNAMETOOL_CHANGE ("${LIBFROM}" "${LIB_CHG_TO}" "${QLIBXDIR}/crssync")
147148
# 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}")
151155
ENDIF ()
152-
INSTALLNAMETOOL_CHANGE ("${LIBFROM}" "${LIB_CHG_TO}" "${QLIBXDIR}/grass/bin/qgis.g.browser")
153-
ENDIF ()
156+
ENDFOREACH (QG)
154157
# plugins
155158
IF (${OSX_HAVE_LOADERPATH})
156159
SET (LIB_CHG_TO "${ATLOADER}/${QGIS_PLUGIN_SUBDIR_REV}/${LIBMID}/${LIBPOST}")
@@ -203,8 +206,9 @@ FILE (GLOB QGFWLIST RELATIVE "${QFWDIR}" "${QFWDIR}/qgis*.framework")
203206
STRING(REPLACE ".framework" ";" QGFWLIST ${QGFWLIST})
204207
# don't collect any library symlinks, limit to versioned libs
205208
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")
207210
FILE (GLOB QGPLUGLIST "${QPLUGDIR}/*.so")
208211
FILE (GLOB QGPYLIST "${QGISPYDIR}/qgis/*.so")
209212
FILE (GLOB QGAPPLIST RELATIVE "${QBINDIR}" "${QBINDIR}/q*.app")
213+
FILE (GLOB QGRASSEXECLIST RELATIVE "${QLIBXDIR}/grass" "${QLIBXDIR}/grass/*/*")
210214
STRING(REPLACE ".app" ";" QGAPPLIST ${QGAPPLIST})

0 commit comments

Comments
 (0)