[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.144.2.9 1.144.2.10 ChangeLog.manual 1.1.10.5 1.1.10.6

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	CMakeLists.txt ChangeLog.manual 
Log Message:
ENH: merge in changes from main tree


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.144.2.9
retrieving revision 1.144.2.10
diff -C 2 -d -r1.144.2.9 -r1.144.2.10
*** CMakeLists.txt	2 Apr 2008 13:16:00 -0000	1.144.2.9
--- CMakeLists.txt	8 Apr 2008 16:22:47 -0000	1.144.2.10
***************
*** 355,359 ****
  SET(CMake_VERSION_MINOR 6)
  SET(CMake_VERSION_PATCH 0)
! SET(CMake_VERSION_RC 6)
  # CVS versions are odd, if this is an odd minor version
  # then set the CMake_VERSION_DATE variable
--- 355,359 ----
  SET(CMake_VERSION_MINOR 6)
  SET(CMake_VERSION_PATCH 0)
! SET(CMake_VERSION_RC 61)
  # CVS versions are odd, if this is an odd minor version
  # then set the CMake_VERSION_DATE variable
***************
*** 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)
    

Index: ChangeLog.manual
===================================================================
RCS file: /cvsroot/CMake/CMake/Attic/ChangeLog.manual,v
retrieving revision 1.1.10.5
retrieving revision 1.1.10.6
diff -C 2 -d -r1.1.10.5 -r1.1.10.6
*** ChangeLog.manual	2 Apr 2008 15:07:52 -0000	1.1.10.5
--- ChangeLog.manual	8 Apr 2008 16:22:47 -0000	1.1.10.6
***************
*** 1,2 ****
--- 1,11 ----
+ Changes in CMake 2.6.0 RC 61
+ - Change install location on mac for cmake-gui
+ - Fix for bugs 6730 and 6720 in FindQt4 configured headers in binary dir
+ - Add VS9 support to InstallRequiredSystemLibraries.cmake
+ - Fix some bugs in framework support
+ - Have make edit_cache work with cmake-gui and eclipse generator
+ - Fix find_* to not mistakenly construct network paths on windows
+ - Several bug fixes in cmake-gui Qt program.
+ 
  Changes in CMake 2.6.0 RC 6