[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.146 1.147

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt 
Log Message:
ENH: install the mac application bundle into /Applications directly with no enclosing folder


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.146
retrieving revision 1.147
diff -C 2 -d -r1.146 -r1.147
*** CMakeLists.txt	19 Mar 2008 01:22:26 -0000	1.146
--- CMakeLists.txt	4 Apr 2008 20:02:49 -0000	1.147
***************
*** 418,427 ****
  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)
      # make sure CMAKE_INSTALL_PREFIX ends in /
      STRING(LENGTH "${CMAKE_INSTALL_PREFIX}" LEN)
--- 418,428 ----
  IF(BUILD_QtDialog)
    IF(APPLE)
!     SET(CMAKE_BUNDLE_NAME
        "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}-${CMake_VERSION_PATCH}")
      IF(CMake_VERSION_DATE)
!       SET(CMAKE_BUNDLE_NAME
          "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}-${CMake_VERSION_DATE}")
      ENDIF(CMake_VERSION_DATE)
+     SET(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
      # make sure CMAKE_INSTALL_PREFIX ends in /
      STRING(LENGTH "${CMAKE_INSTALL_PREFIX}" LEN)
***************
*** 431,436 ****
        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)
    
--- 432,437 ----
        SET(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/")
      ENDIF(NOT "${ENDCH}" STREQUAL "/")
!     SET(CMAKE_INSTALL_PREFIX 
!       "${CMAKE_INSTALL_PREFIX}${CMAKE_BUNDLE_NAME}.app/Contents")
    ENDIF(APPLE)