Merge pull request #196 from dakcarto/fix_mac-build-libs

kyngchaos · kyngchaos · commit d5f16c7cf521 · 2012-07-21T08:29:39.000-07:00
Fix bundled libs linking
diff --git a/cmake/MacBundleMacros.cmake b/cmake/MacBundleMacros.cmake
@@ -2,13 +2,13 @@
 
 # BundleUtilities has functions to bundle and fixup libraries into an
 # application package, but it's all-or-nothing and is missing some features:
-# 
+#
 # - @loader_path
 # - helper functions can't get install_name, just dependencies
 
 # the following cmakecache vars must be set, redefine them
 # with config-file substitutions in install-run scripts:
-# 
+#
 # CPACK_PACKAGE_VERSION_MAJOR, CPACK_PACKAGE_VERSION_MINOR
 # CMAKE_INSTALL_PREFIX, CMAKE_VERBOSE_MAKEFILE, CMAKE_BUILD_TYPE
 # CMAKE_OSX_ARCHITECTURES, OSX_HAVE_LOADERPATH
@@ -118,8 +118,8 @@ FUNCTION (UPDATEQGISPATHS LIBFROM LIBTO)
         # libs
         IF (${OSX_HAVE_LOADERPATH})
             # bundled frameworks can use short relative path
-            IF (ISLIB})
-                SET (LIB_CHG_TO "${ATLOADER}/${QGIS_FW_SUBDIR_REV}/${LIBMID}/${LIBPOST}")
+            IF (ISLIB)
+                SET (LIB_CHG_TO "${ATLOADER}/../../../${QGIS_FW_SUBDIR_REV}/${LIBMID}/${LIBPOST}")
             ElSE ()
                 SET (LIB_CHG_TO "${ATLOADER}/../../../${LIBPOST}")
             ENDIF ()
diff --git a/mac/cmake/1qt.cmake.in b/mac/cmake/1qt.cmake.in
@@ -84,7 +84,7 @@ IF (NOT EXISTS "${QLIBDIR}/libqwt.dylib")
 ENDIF ()
 GET_INSTALL_NAME ("@QWT_LIBRARY@" "libqwt" QWT_CHG)
 IF (QWT_CHG)
-    INSTALLNAMETOOL_CHANGE ("${QWT_CHG}" "${ATEXECUTABLE}/@QGIS_LIB_SUBDIR@/libqwt.dylib" "${QAPPDIR}/@QGIS_APP_NAME@")
+    UPDATEQGISPATHS (${QWT_CHG} libqwt.dylib)
 ENDIF (QWT_CHG)
 
 # PyQt
