handle crssync in bundling stage

qgis · Apr 21, 2012 · 517fd7e · 517fd7e
1 parent 871ceb1
commit 517fd7e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 23 deletions.
diff --git a/cmake/MacBundleMacros.cmake b/cmake/MacBundleMacros.cmake
@@ -132,6 +132,11 @@ FUNCTION (UPDATEQGISPATHS LIBFROM LIBTO)
             SET (LIB_CHG_TO "${ATLOADER}/${QGIS_LIB_SUBDIR_REV}/${LIBMID}/${LIBPOST}")
         ENDIF ()
         INSTALLNAMETOOL_CHANGE ("${LIBFROM}" "${LIB_CHG_TO}" "${QLIBDIR}/libqgispython.dylib")
+        # crssync
+        IF (${OSX_HAVE_LOADERPATH})
+            SET (LIB_CHG_TO "${ATEXECUTABLE}/${QGIS_LIBEXEC_SUBDIR_REV}/${LIBMID}/${LIBPOST}")
+        ENDIF ()
+        INSTALLNAMETOOL_CHANGE ("${LIBFROM}" "${LIB_CHG_TO}" "${QLIBXDIR}/crssync")
         # GRASS libexec stuff
         IF (EXISTS "${QLIBXDIR}/grass/bin/qgis.g.browser")
            IF (${OSX_HAVE_LOADERPATH})

diff --git a/mac/cmake/0qgis.cmake.in b/mac/cmake/0qgis.cmake.in
@@ -17,28 +17,8 @@ IF (@OSX_HAVE_LOADERPATH@)
     MESSAGE (STATUS "Updating QGIS library paths...")
     # inter-library links - do all combos, many will be noops
     FOREACH (QL ${QGFWLIST})
-        FOREACH (QLL ${QGFWLIST})
-            INSTALLNAMETOOL_CHANGE (@CMAKE_INSTALL_NAME_DIR@/${QLL}.framework/Versions/${Q_FWVER}/${QLL} ${ATLOADER}/../../../${QLL}.framework/Versions/${Q_FWVER}/${QLL} "${QFWDIR}/${QL}.framework/${QL}")
-        ENDFOREACH (QLL)
-        # libqgispython is not a framework
-        INSTALLNAMETOOL_CHANGE (@CMAKE_INSTALL_NAME_DIR@/${QL}.framework/Versions/${Q_FWVER}/${QL} ${ATLOADER}/@QGIS_LIB_SUBDIR_REV@/@QGIS_FW_SUBDIR@/${QL}.framework/Versions/${Q_FWVER}/${QL} "${QLIBDIR}/libqgispython.dylib")
+        GET_INSTALL_NAME ("${QFWDIR}/${QL}.framework/${QL}" ${QL}.framework QQ)
+        SET (QFW_CHG "${QQ}")
+        UPDATEQGISPATHS ("${QFW_CHG}" ${QL})
     ENDFOREACH (QL)
-    # plugins
-    FOREACH (QP ${QGPLUGLIST})
-        FOREACH (QLL ${QGFWLIST})
-            INSTALLNAMETOOL_CHANGE (@CMAKE_INSTALL_NAME_DIR@/${QLL}.framework/Versions/${Q_FWVER}/${QLL} ${ATLOADER}/@QGIS_PLUGIN_SUBDIR_REV@/@QGIS_FW_SUBDIR@/${QLL}.framework/Versions/${Q_FWVER}/${QLL} "${QP}")
-        ENDFOREACH (QLL)
-    ENDFOREACH (QP)
-    # qgis python
-    FOREACH (PG ${QGPYLIST})
-        FOREACH (QLL ${QGFWLIST})
-            INSTALLNAMETOOL_CHANGE (@CMAKE_INSTALL_NAME_DIR@/${QLL}.framework/Versions/${Q_FWVER}/${QLL} ${ATLOADER}/../../@QGIS_DATA_SUBDIR_REV@/@QGIS_FW_SUBDIR@/${QLL}.framework/Versions/${Q_FWVER}/${QLL} "${PG}")
-        ENDFOREACH (QLL)
-    ENDFOREACH (PG)
-    # qgis-mapserver
-    IF (@WITH_MAPSERVER@)
-        FOREACH (QLL ${QGFWLIST})
-            INSTALLNAMETOOL_CHANGE (@CMAKE_INSTALL_NAME_DIR@/${QLL}.framework/Versions/${Q_FWVER}/${QLL} ${ATLOADER}/@QGIS_CGIBIN_SUBDIR_REV@/@QGIS_FW_SUBDIR@/${QLL}.framework/Versions/${Q_FWVER}/${QLL} "${QCGIDIR}/qgis_mapserv.fcgi")
-        ENDFOREACH (QLL)
-    ENDIF ()
 ENDIF (@OSX_HAVE_LOADERPATH@)