[QGIS Commit] r14501 - in trunk/qgis: mac mac/cmake src/helpviewer

[svn_qgis at osgeo.org]

Author: kyngchaos
Date: 2010-11-03 20:01:48 -0700 (Wed, 03 Nov 2010)
New Revision: 14501

Modified:
   trunk/qgis/mac/CMakeLists.txt
   trunk/qgis/mac/cmake/0qgis.cmake.in
   trunk/qgis/mac/cmake/1qt.cmake.in
   trunk/qgis/mac/cmake/2lib.cmake.in
   trunk/qgis/mac/cmake/3fw.cmake.in
   trunk/qgis/src/helpviewer/CMakeLists.txt
Log:
support DESTDIR in bundling

Modified: trunk/qgis/mac/CMakeLists.txt
===================================================================
--- trunk/qgis/mac/CMakeLists.txt	2010-11-03 22:10:34 UTC (rev 14500)
+++ trunk/qgis/mac/CMakeLists.txt	2010-11-04 03:01:48 UTC (rev 14501)
@@ -26,5 +26,5 @@
     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)

Modified: trunk/qgis/mac/cmake/0qgis.cmake.in
===================================================================
--- trunk/qgis/mac/cmake/0qgis.cmake.in	2010-11-03 22:10:34 UTC (rev 14500)
+++ trunk/qgis/mac/cmake/0qgis.cmake.in	2010-11-04 03:01:48 UTC (rev 14501)
@@ -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@")

Modified: trunk/qgis/mac/cmake/1qt.cmake.in
===================================================================
--- trunk/qgis/mac/cmake/1qt.cmake.in	2010-11-03 22:10:34 UTC (rev 14500)
+++ trunk/qgis/mac/cmake/1qt.cmake.in	2010-11-04 03:01:48 UTC (rev 14501)
@@ -9,8 +9,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@")

Modified: trunk/qgis/mac/cmake/2lib.cmake.in
===================================================================
--- trunk/qgis/mac/cmake/2lib.cmake.in	2010-11-03 22:10:34 UTC (rev 14500)
+++ trunk/qgis/mac/cmake/2lib.cmake.in	2010-11-04 03:01:48 UTC (rev 14501)
@@ -13,8 +13,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@")

Modified: trunk/qgis/mac/cmake/3fw.cmake.in
===================================================================
--- trunk/qgis/mac/cmake/3fw.cmake.in	2010-11-03 22:10:34 UTC (rev 14500)
+++ trunk/qgis/mac/cmake/3fw.cmake.in	2010-11-04 03:01:48 UTC (rev 14501)
@@ -11,8 +11,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@")

Modified: trunk/qgis/src/helpviewer/CMakeLists.txt
===================================================================
--- trunk/qgis/src/helpviewer/CMakeLists.txt	2010-11-03 22:10:34 UTC (rev 14500)
+++ trunk/qgis/src/helpviewer/CMakeLists.txt	2010-11-04 03:01:48 UTC (rev 14501)
@@ -100,8 +100,8 @@
 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)