[Cmake-commits] [cmake-commits] hoffman committed CMakeCPack.cmake 1.11 1.11.2.1 CMakeLists.txt 1.144.2.22 1.144.2.23 ChangeLog.manual 1.1.10.21 1.1.10.22

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	CMakeCPack.cmake CMakeLists.txt ChangeLog.manual 
Log Message:
ENH: push in changes from head


Index: CMakeCPack.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeCPack.cmake,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C 2 -d -r1.11 -r1.11.2.1
*** CMakeCPack.cmake	9 Feb 2008 14:53:52 -0000	1.11
--- CMakeCPack.cmake	23 May 2008 20:09:19 -0000	1.11.2.1
***************
*** 33,37 ****
    ENDIF(CMake_VERSION_RC)
    IF(NOT DEFINED CPACK_SYSTEM_NAME)
!     SET(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR})
    ENDIF(NOT DEFINED CPACK_SYSTEM_NAME)
    IF(${CPACK_SYSTEM_NAME} MATCHES Windows)
--- 33,43 ----
    ENDIF(CMake_VERSION_RC)
    IF(NOT DEFINED CPACK_SYSTEM_NAME)
!     # make sure package is not Cygwin-unknown, for Cygwin just
!     # cygwin is good for the system name
!     IF("${CMAKE_SYSTEM_NAME}" STREQUAL "CYGWIN")
!       SET(CPACK_SYSTEM_NAME Cygwin)
!     ELSE("${CMAKE_SYSTEM_NAME}" STREQUAL "CYGWIN")
!       SET(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR})
!     ENDIF("${CMAKE_SYSTEM_NAME}" STREQUAL "CYGWIN")
    ENDIF(NOT DEFINED CPACK_SYSTEM_NAME)
    IF(${CPACK_SYSTEM_NAME} MATCHES Windows)
***************
*** 43,47 ****
    ENDIF(${CPACK_SYSTEM_NAME} MATCHES Windows)
    IF(NOT DEFINED CPACK_PACKAGE_FILE_NAME)
!     SET(CPACK_PACKAGE_FILE_NAME "${CPACK_SOURCE_PACKAGE_FILE_NAME}-${CPACK_SYSTEM_NAME}")
    ENDIF(NOT DEFINED CPACK_PACKAGE_FILE_NAME)
    SET(CPACK_PACKAGE_CONTACT "cmake at cmake.org")
--- 49,61 ----
    ENDIF(${CPACK_SYSTEM_NAME} MATCHES Windows)
    IF(NOT DEFINED CPACK_PACKAGE_FILE_NAME)
!     # if the CPACK_PACKAGE_FILE_NAME is not defined by the cache
!     # default to source package - system, on cygwin system is not 
!     # needed
!     IF(CYGWIN)
!       SET(CPACK_PACKAGE_FILE_NAME "${CPACK_SOURCE_PACKAGE_FILE_NAME}")
!     ELSE(CYGWIN)
!       SET(CPACK_PACKAGE_FILE_NAME 
!         "${CPACK_SOURCE_PACKAGE_FILE_NAME}-${CPACK_SYSTEM_NAME}")
!     ENDIF(CYGWIN)
    ENDIF(NOT DEFINED CPACK_PACKAGE_FILE_NAME)
    SET(CPACK_PACKAGE_CONTACT "cmake at cmake.org")
***************
*** 53,56 ****
--- 67,71 ----
  # cygwin specific packaging stuff
    IF(CYGWIN)
+     
      # if we are on cygwin and have cpack, then force the 
      # doc, data and man dirs to conform to cygwin style directories

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.144.2.22
retrieving revision 1.144.2.23
diff -C 2 -d -r1.144.2.22 -r1.144.2.23
*** CMakeLists.txt	15 May 2008 19:39:49 -0000	1.144.2.22
--- CMakeLists.txt	23 May 2008 20:09:30 -0000	1.144.2.23
***************
*** 355,359 ****
  SET(CMake_VERSION_MINOR 6)
  SET(CMake_VERSION_PATCH 1)
! SET(CMake_VERSION_RC 1)
  # 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 1)
! SET(CMake_VERSION_RC 2)
  # CVS versions are odd, if this is an odd minor version
  # then set the CMake_VERSION_DATE variable

Index: ChangeLog.manual
===================================================================
RCS file: /cvsroot/CMake/CMake/Attic/ChangeLog.manual,v
retrieving revision 1.1.10.21
retrieving revision 1.1.10.22
diff -C 2 -d -r1.1.10.21 -r1.1.10.22
*** ChangeLog.manual	15 May 2008 19:39:49 -0000	1.1.10.21
--- ChangeLog.manual	23 May 2008 20:09:31 -0000	1.1.10.22
***************
*** 1,2 ****
--- 1,19 ----
+ Changes in CMake 2.6.1 RC 2
+ 
+ - FindQt4 - report an error when trying to use MSVC with Qt built by mingw.
+ - FindQt4 - make Qt not found if the QtCore library can't be found.
+ - UseQt4 - only add flags for modles that are used
+ - Log file and LC_ALL fix for FindSubversion
+ - Make MacOSXBundleInfo.plist.in a configured file again
+ - Fix makefile generator targets to depend on full path link libraries
+ - Allow CMakeImportBuildSettings to not match tools if 
+   CMAKE_OVERRIDE_COMPILER_MISMATCH is set
+ - Fix incorrect extension extraction in gcc cross compiler check
+ - Add support for Portand Fortran
+ - Fix list command with empty list values
+ - Add support for setting compiler and toolchain in qt cmake-gui
+ - Fix Bug 7011, FindQt4 was slow on a mac, find_path should not glob in /
+ - Fix install directories for cygwin package of CMake
+ 
  Changes in CMake 2.6.1 RC 1
  - Add a way to modify depend scanning with the property: