Skip to content
Permalink
Browse files

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.
  • Loading branch information
dakcarto committed Jul 20, 2012
1 parent 89c8186 commit 2599bf4683a8e23eb8e0a75addcb500196303b36
Showing with 5 additions and 5 deletions.
  1. +4 −4 cmake/MacBundleMacros.cmake
  2. +1 −1 mac/cmake/1qt.cmake.in
@@ -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 ()
@@ -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

0 comments on commit 2599bf4

Please sign in to comment.
You can’t perform that action at this time.