[cmake-commits] hoffman committed CMakeLists.txt 1.138 1.139 bootstrap 1.109 1.110

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake
In directory public:/mounts/ram/cvs-serv18681

Modified Files:
	CMakeLists.txt bootstrap 
Log Message:
ENH: support for cpack and install of cmake-gui as mac app bundle 


Index: bootstrap
===================================================================
RCS file: /cvsroot/CMake/CMake/bootstrap,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- bootstrap	13 Feb 2008 19:47:03 -0000	1.109
+++ bootstrap	16 Feb 2008 18:05:03 -0000	1.110
@@ -143,10 +143,14 @@
   cmPropertyDefinitionMap \
   cmMakeDepend \
   cmMakefile \
+  cmExportFileGenerator \
+  cmExportInstallFileGenerator \
+  cmInstallDirectoryGenerator \
   cmGeneratedFileStream \
   cmGlobalGenerator \
   cmLocalGenerator \
   cmInstallGenerator \
+  cmInstallExportGenerator \
   cmInstallFilesGenerator \
   cmInstallScriptGenerator \
   cmInstallTargetGenerator \

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -d -r1.138 -r1.139
--- CMakeLists.txt	24 Nov 2007 01:45:49 -0000	1.138
+++ CMakeLists.txt	16 Feb 2008 18:05:03 -0000	1.139
@@ -412,6 +412,17 @@
 ENDIF(BUILD_CursesDialog)
 
 IF(BUILD_QtDialog)
+  IF(APPLE)
+    SET(CMAKE_INSTALL_SUBDIR 
+      "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}-${CMake_VERSION_PATCH}")
+    IF(CMake_VERSION_DATE)
+      SET(CMAKE_INSTALL_SUBDIR 
+        "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}-${CMake_VERSION_DATE}")
+    ENDIF(CMake_VERSION_DATE)
+    SET(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_SUBDIR}")
+    SET(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_SUBDIR}/cmake-gui.app/Contents")
+  ENDIF(APPLE)
+  
   SET(QT_NEED_RPATH FALSE)
   IF(NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib64" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib64")
     SET(QT_NEED_RPATH TRUE)