[cmake-commits] hoffman committed CMakeCPackOptions.cmake.in 1.6 1.7 CMakeLists.txt 1.140 1.141

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeCPackOptions.cmake.in CMakeLists.txt 
Log Message:
ENH: install seems to be working for cmake-gui


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -d -r1.140 -r1.141
--- CMakeLists.txt	18 Feb 2008 16:10:39 -0000	1.140
+++ CMakeLists.txt	18 Feb 2008 20:50:37 -0000	1.141
@@ -419,8 +419,15 @@
       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")
+    # make sure CMAKE_INSTALL_PREFIX ends in /
+    STRING(LENGTH "${CMAKE_INSTALL_PREFIX}" LEN)
+    MATH(EXPR LEN "${LEN} -1" )
+    STRING(SUBSTRING "${CMAKE_INSTALL_PREFIX}" ${LEN} 1 ENDCH)
+    IF(NOT "${ENDCH}" STREQUAL "/")
+      SET(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/")
+    ENDIF(NOT "${ENDCH}" STREQUAL "/")
+    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)

Index: CMakeCPackOptions.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeCPackOptions.cmake.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- CMakeCPackOptions.cmake.in	9 Feb 2008 14:53:52 -0000	1.6
+++ CMakeCPackOptions.cmake.in	18 Feb 2008 20:50:37 -0000	1.7
@@ -3,7 +3,6 @@
 # in this file.  
 
 if(CPACK_GENERATOR MATCHES "NSIS")
-  SET(QT_DIALOG_OPTIONS_FILE @QT_DIALOG_OPTIONS_FILE@)
   # set the install/unistall icon used for the installer itself
   # There is a bug in NSI that does not handle full unix paths properly. 
   SET(CPACK_NSIS_MUI_ICON "@CMake_SOURCE_DIR@/Utilities/Release\\CMakeLogo.ico")
@@ -43,5 +42,9 @@
 endif(CPACK_GENERATOR MATCHES "CygwinSource")
 
 if("${CPACK_GENERATOR}" STREQUAL "PackageMaker")
-  SET(CPACK_PACKAGING_INSTALL_PREFIX "/usr")
+  if(CMAKE_PACKAGE_QTGUI)                       
+    set(CPACK_PACKAGE_DEFAULT_LOCATION "/Applications")
+  else(CMAKE_PACKAGE_QTGUI)                     
+    set(CPACK_PACKAGE_DEFAULT_LOCATION "/usr")
+  endif(CMAKE_PACKAGE_QTGUI)                    
 endif("${CPACK_GENERATOR}" STREQUAL "PackageMaker")