From a3781c85fcaee3f49b95e101317a19594f575c98 Mon Sep 17 00:00:00 2001
From: Bill Hoffman <bill.hoffman@kitware.com>
Date: Mon, 18 Feb 2008 15:50:37 -0500
Subject: ENH: install seems to be working for cmake-gui

---
 CMakeCPackOptions.cmake.in |  7 +++++--
 CMakeLists.txt             | 11 +++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/CMakeCPackOptions.cmake.in b/CMakeCPackOptions.cmake.in
index d3b35e8..e20cdc4 100644
--- a/CMakeCPackOptions.cmake.in
+++ b/CMakeCPackOptions.cmake.in
@@ -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 @@ if(CPACK_GENERATOR MATCHES "CygwinSource")
 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")
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d6d5921..2f9a655 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -419,8 +419,15 @@ IF(BUILD_QtDialog)
       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)
-- 
cgit v0.12