Skip to content

Commit 2599bf4

Browse files
committed
Fix for Mac source builds.
Builds were not portable (i.e. Snow Leopard to Lion, dev Mac to client) because libs were still referencing dev Mac's libs and were not being updated on bundle frameworks.
1 parent 89c8186 commit 2599bf4

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

cmake/MacBundleMacros.cmake

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
# BundleUtilities has functions to bundle and fixup libraries into an
44
# application package, but it's all-or-nothing and is missing some features:
5-
#
5+
#
66
# - @loader_path
77
# - helper functions can't get install_name, just dependencies
88

99
# the following cmakecache vars must be set, redefine them
1010
# with config-file substitutions in install-run scripts:
11-
#
11+
#
1212
# CPACK_PACKAGE_VERSION_MAJOR, CPACK_PACKAGE_VERSION_MINOR
1313
# CMAKE_INSTALL_PREFIX, CMAKE_VERBOSE_MAKEFILE, CMAKE_BUILD_TYPE
1414
# CMAKE_OSX_ARCHITECTURES, OSX_HAVE_LOADERPATH
@@ -118,8 +118,8 @@ FUNCTION (UPDATEQGISPATHS LIBFROM LIBTO)
118118
# libs
119119
IF (${OSX_HAVE_LOADERPATH})
120120
# bundled frameworks can use short relative path
121-
IF (ISLIB})
122-
SET (LIB_CHG_TO "${ATLOADER}/${QGIS_FW_SUBDIR_REV}/${LIBMID}/${LIBPOST}")
121+
IF (ISLIB)
122+
SET (LIB_CHG_TO "${ATLOADER}/../../../${QGIS_FW_SUBDIR_REV}/${LIBMID}/${LIBPOST}")
123123
ElSE ()
124124
SET (LIB_CHG_TO "${ATLOADER}/../../../${LIBPOST}")
125125
ENDIF ()

mac/cmake/1qt.cmake.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ IF (NOT EXISTS "${QLIBDIR}/libqwt.dylib")
8484
ENDIF ()
8585
GET_INSTALL_NAME ("@QWT_LIBRARY@" "libqwt" QWT_CHG)
8686
IF (QWT_CHG)
87-
INSTALLNAMETOOL_CHANGE ("${QWT_CHG}" "${ATEXECUTABLE}/@QGIS_LIB_SUBDIR@/libqwt.dylib" "${QAPPDIR}/@QGIS_APP_NAME@")
87+
UPDATEQGISPATHS (${QWT_CHG} libqwt.dylib)
8888
ENDIF (QWT_CHG)
8989

9090
# PyQt

0 commit comments

Comments
 (0)