diff --git a/mac/CMakeLists.txt b/mac/CMakeLists.txt index 22c6e00163eb..42b2ccfa79e1 100644 --- a/mac/CMakeLists.txt +++ b/mac/CMakeLists.txt @@ -26,5 +26,5 @@ IF (APPLE) INSTALL (SCRIPT ${CMAKE_BINARY_DIR}/mac/4user.cmake) ENDIF (QGIS_MACAPP_BUNDLE_USER) # tickle app bundle - INSTALL (CODE "EXECUTE_PROCESS(COMMAND touch ${CMAKE_INSTALL_PREFIX}/../../.)") + INSTALL (CODE "EXECUTE_PROCESS(COMMAND touch \"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/../../.\")") ENDIF (APPLE) diff --git a/mac/cmake/0qgis.cmake.in b/mac/cmake/0qgis.cmake.in index d9afb9ebc111..04a6c22ffc8c 100644 --- a/mac/cmake/0qgis.cmake.in +++ b/mac/cmake/0qgis.cmake.in @@ -6,8 +6,8 @@ # kill boolean warnings CMAKE_POLICY (SET CMP0012 NEW) -SET (QAPPDIRC "@QGIS_MACAPP_PREFIX@") -SET (QAPPDIR "@CMAKE_INSTALL_PREFIX@") +SET (QAPPDIRC "$ENV{DESTDIR}@QGIS_MACAPP_PREFIX@") +SET (QAPPDIR "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@") SET (QFWDIR "${QAPPDIR}/@QGIS_FW_SUBDIR@") SET (QBINDIR "${QAPPDIR}/@QGIS_BIN_SUBDIR@") SET (QCGIDIR "${QAPPDIR}/@QGIS_CGIBIN_SUBDIR@") diff --git a/mac/cmake/1qt.cmake.in b/mac/cmake/1qt.cmake.in index 59e597341a81..047e922a67e8 100644 --- a/mac/cmake/1qt.cmake.in +++ b/mac/cmake/1qt.cmake.in @@ -9,8 +9,8 @@ INCLUDE (GetPrerequisites) # kill boolean warnings CMAKE_POLICY (SET CMP0012 NEW) -SET (QAPPDIRC "@QGIS_MACAPP_PREFIX@") -SET (QAPPDIR "@CMAKE_INSTALL_PREFIX@") +SET (QAPPDIRC "$ENV{DESTDIR}@QGIS_MACAPP_PREFIX@") +SET (QAPPDIR "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@") SET (QFWDIR "${QAPPDIR}/@QGIS_FW_SUBDIR@") SET (QBINDIR "${QAPPDIR}/@QGIS_BIN_SUBDIR@") SET (QCGIDIR "${QAPPDIR}/@QGIS_CGIBIN_SUBDIR@") diff --git a/mac/cmake/2lib.cmake.in b/mac/cmake/2lib.cmake.in index 01e72a314d31..b7162df371bc 100644 --- a/mac/cmake/2lib.cmake.in +++ b/mac/cmake/2lib.cmake.in @@ -13,8 +13,8 @@ INCLUDE (GetPrerequisites) # kill boolean warnings CMAKE_POLICY (SET CMP0012 NEW) -SET (QAPPDIRC "@QGIS_MACAPP_PREFIX@") -SET (QAPPDIR "@CMAKE_INSTALL_PREFIX@") +SET (QAPPDIRC "$ENV{DESTDIR}@QGIS_MACAPP_PREFIX@") +SET (QAPPDIR "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@") SET (QFWDIR "${QAPPDIR}/@QGIS_FW_SUBDIR@") SET (QBINDIR "${QAPPDIR}/@QGIS_BIN_SUBDIR@") SET (QCGIDIR "${QAPPDIR}/@QGIS_CGIBIN_SUBDIR@") diff --git a/mac/cmake/3fw.cmake.in b/mac/cmake/3fw.cmake.in index 0de37fabd24a..a83a9803bafc 100644 --- a/mac/cmake/3fw.cmake.in +++ b/mac/cmake/3fw.cmake.in @@ -11,8 +11,8 @@ INCLUDE (GetPrerequisites) # kill boolean warnings CMAKE_POLICY (SET CMP0012 NEW) -SET (QAPPDIRC "@QGIS_MACAPP_PREFIX@") -SET (QAPPDIR "@CMAKE_INSTALL_PREFIX@") +SET (QAPPDIRC "$ENV{DESTDIR}@QGIS_MACAPP_PREFIX@") +SET (QAPPDIR "$ENV{DESTDIR}@CMAKE_INSTALL_PREFIX@") SET (QFWDIR "${QAPPDIR}/@QGIS_FW_SUBDIR@") SET (QBINDIR "${QAPPDIR}/@QGIS_BIN_SUBDIR@") SET (QCGIDIR "${QAPPDIR}/@QGIS_CGIBIN_SUBDIR@") diff --git a/src/helpviewer/CMakeLists.txt b/src/helpviewer/CMakeLists.txt index 1f223f1ba3c0..cae138857d17 100644 --- a/src/helpviewer/CMakeLists.txt +++ b/src/helpviewer/CMakeLists.txt @@ -100,8 +100,8 @@ SET_TARGET_PROPERTIES(qgis_help PROPERTIES IF (APPLE) INSTALL (TARGETS qgis_help BUNDLE DESTINATION ${QGIS_BIN_DIR}) # needed because global install_name prefix is for main qgis app - INSTALL (CODE "EXECUTE_PROCESS(COMMAND install_name_tool -change ${CMAKE_INSTALL_NAME_DIR}/libqgis_core.${COMPLETE_VERSION}.dylib @executable_path/../../../../lib/libqgis_core.${COMPLETE_VERSION}.dylib \"${CMAKE_INSTALL_PREFIX}/${QGIS_BIN_DIR}/qgis_help.app/Contents/MacOS/qgis_help\")") - INSTALL (CODE "EXECUTE_PROCESS (COMMAND ln -sfh ../../../${QGIS_FW_SUBDIR} \"${CMAKE_INSTALL_PREFIX}/${QGIS_BIN_DIR}/qgis_help.app/Contents/Frameworks\")") + INSTALL (CODE "EXECUTE_PROCESS(COMMAND install_name_tool -change ${CMAKE_INSTALL_NAME_DIR}/libqgis_core.${COMPLETE_VERSION}.dylib @executable_path/../../../../lib/libqgis_core.${COMPLETE_VERSION}.dylib \"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${QGIS_BIN_DIR}/qgis_help.app/Contents/MacOS/qgis_help\")") + INSTALL (CODE "EXECUTE_PROCESS (COMMAND ln -sfh ../../../${QGIS_FW_SUBDIR} \"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${QGIS_BIN_DIR}/qgis_help.app/Contents/Frameworks\")") ELSE (APPLE) INSTALL (TARGETS qgis_help RUNTIME DESTINATION ${QGIS_BIN_DIR}) ENDIF (APPLE)