File tree Expand file tree Collapse file tree 6 files changed +11
-11
lines changed Expand file tree Collapse file tree 6 files changed +11
-11
lines changed Original file line number Diff line number Diff line change @@ -26,5 +26,5 @@ IF (APPLE)
2626 INSTALL (SCRIPT ${CMAKE_BINARY_DIR} /mac/4user.cmake)
2727 ENDIF (QGIS_MACAPP_BUNDLE_USER)
2828 # tickle app bundle
29- INSTALL (CODE "EXECUTE_PROCESS(COMMAND touch ${ CMAKE_INSTALL_PREFIX} /../../.)" )
29+ INSTALL (CODE "EXECUTE_PROCESS(COMMAND touch \" $ENV{DESTDIR}${ CMAKE_INSTALL_PREFIX} /../../.\" )" )
3030ENDIF (APPLE )
Original file line number Diff line number Diff line change 66# kill boolean warnings
77CMAKE_POLICY (SET CMP0012 NEW)
88
9- SET (QAPPDIRC "@QGIS_MACAPP_PREFIX@" )
10- SET (QAPPDIR "@CMAKE_INSTALL_PREFIX@" )
9+ SET (QAPPDIRC "$ENV{DESTDIR} @QGIS_MACAPP_PREFIX@" )
10+ SET (QAPPDIR "$ENV{DESTDIR} @CMAKE_INSTALL_PREFIX@" )
1111SET (QFWDIR "${QAPPDIR} /@QGIS_FW_SUBDIR@" )
1212SET (QBINDIR "${QAPPDIR} /@QGIS_BIN_SUBDIR@" )
1313SET (QCGIDIR "${QAPPDIR} /@QGIS_CGIBIN_SUBDIR@" )
Original file line number Diff line number Diff line change @@ -9,8 +9,8 @@ INCLUDE (GetPrerequisites)
99# kill boolean warnings
1010CMAKE_POLICY (SET CMP0012 NEW)
1111
12- SET (QAPPDIRC "@QGIS_MACAPP_PREFIX@" )
13- SET (QAPPDIR "@CMAKE_INSTALL_PREFIX@" )
12+ SET (QAPPDIRC "$ENV{DESTDIR} @QGIS_MACAPP_PREFIX@" )
13+ SET (QAPPDIR "$ENV{DESTDIR} @CMAKE_INSTALL_PREFIX@" )
1414SET (QFWDIR "${QAPPDIR} /@QGIS_FW_SUBDIR@" )
1515SET (QBINDIR "${QAPPDIR} /@QGIS_BIN_SUBDIR@" )
1616SET (QCGIDIR "${QAPPDIR} /@QGIS_CGIBIN_SUBDIR@" )
Original file line number Diff line number Diff line change @@ -13,8 +13,8 @@ INCLUDE (GetPrerequisites)
1313# kill boolean warnings
1414CMAKE_POLICY (SET CMP0012 NEW)
1515
16- SET (QAPPDIRC "@QGIS_MACAPP_PREFIX@" )
17- SET (QAPPDIR "@CMAKE_INSTALL_PREFIX@" )
16+ SET (QAPPDIRC "$ENV{DESTDIR} @QGIS_MACAPP_PREFIX@" )
17+ SET (QAPPDIR "$ENV{DESTDIR} @CMAKE_INSTALL_PREFIX@" )
1818SET (QFWDIR "${QAPPDIR} /@QGIS_FW_SUBDIR@" )
1919SET (QBINDIR "${QAPPDIR} /@QGIS_BIN_SUBDIR@" )
2020SET (QCGIDIR "${QAPPDIR} /@QGIS_CGIBIN_SUBDIR@" )
Original file line number Diff line number Diff line change @@ -11,8 +11,8 @@ INCLUDE (GetPrerequisites)
1111# kill boolean warnings
1212CMAKE_POLICY (SET CMP0012 NEW)
1313
14- SET (QAPPDIRC "@QGIS_MACAPP_PREFIX@" )
15- SET (QAPPDIR "@CMAKE_INSTALL_PREFIX@" )
14+ SET (QAPPDIRC "$ENV{DESTDIR} @QGIS_MACAPP_PREFIX@" )
15+ SET (QAPPDIR "$ENV{DESTDIR} @CMAKE_INSTALL_PREFIX@" )
1616SET (QFWDIR "${QAPPDIR} /@QGIS_FW_SUBDIR@" )
1717SET (QBINDIR "${QAPPDIR} /@QGIS_BIN_SUBDIR@" )
1818SET (QCGIDIR "${QAPPDIR} /@QGIS_CGIBIN_SUBDIR@" )
Original file line number Diff line number Diff line change @@ -100,8 +100,8 @@ SET_TARGET_PROPERTIES(qgis_help PROPERTIES
100100IF (APPLE )
101101 INSTALL (TARGETS qgis_help BUNDLE DESTINATION ${QGIS_BIN_DIR} )
102102 # needed because global install_name prefix is for main qgis app
103- 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\" )" )
104- INSTALL (CODE "EXECUTE_PROCESS (COMMAND ln -sfh ../../../${QGIS_FW_SUBDIR} \" ${CMAKE_INSTALL_PREFIX} /${QGIS_BIN_DIR} /qgis_help.app/Contents/Frameworks\" )" )
103+ 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\" )" )
104+ INSTALL (CODE "EXECUTE_PROCESS (COMMAND ln -sfh ../../../${QGIS_FW_SUBDIR} \" $ENV{DESTDIR}$ {CMAKE_INSTALL_PREFIX} /${QGIS_BIN_DIR} /qgis_help.app/Contents/Frameworks\" )" )
105105ELSE (APPLE )
106106 INSTALL (TARGETS qgis_help RUNTIME DESTINATION ${QGIS_BIN_DIR} )
107107ENDIF (APPLE )
You can’t perform that action at this time.
0 commit comments