[Cmake-commits] [cmake-commits] hoffman committed CMakeGenericSystem.cmake 1.19 1.19.2.1 CMakeSystemSpecificInformation.cmake 1.40 1.40.2.1 FindGettext.cmake 1.2.12.1 1.2.12.2 FindPythonInterp.cmake 1.10 1.10.2.1

cmake-commits at cmake.org cmake-commits at cmake.org
Tue Jan 13 13:03:51 EST 2009


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

Modified Files:
      Tag: CMake-2-6
	CMakeGenericSystem.cmake CMakeSystemSpecificInformation.cmake 
	FindGettext.cmake FindPythonInterp.cmake 
Log Message:
ENH: merge in changes from CVS to branch for 2.6.3 RC 8


Index: FindGettext.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindGettext.cmake,v
retrieving revision 1.2.12.1
retrieving revision 1.2.12.2
diff -C 2 -d -r1.2.12.1 -r1.2.12.2
*** FindGettext.cmake	30 Jun 2008 20:10:27 -0000	1.2.12.1
--- FindGettext.cmake	13 Jan 2009 18:03:49 -0000	1.2.12.2
***************
*** 19,23 ****
  FIND_PROGRAM(GETTEXT_MSGFMT_EXECUTABLE msgfmt)
  
! MACRO(GETTEXT_CREATE_TRANSLATIONS _potFile _firstPoFile)
  
     SET(_gmoFiles)
--- 19,25 ----
  FIND_PROGRAM(GETTEXT_MSGFMT_EXECUTABLE msgfmt)
  
! MACRO(GETTEXT_CREATE_TRANSLATIONS _potFile _firstPoFileArg)
!    # make it a real variable, so we can modify it here
!    SET(_firstPoFile "${_firstPoFileArg}")
  
     SET(_gmoFiles)

Index: CMakeGenericSystem.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeGenericSystem.cmake,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -C 2 -d -r1.19 -r1.19.2.1
*** CMakeGenericSystem.cmake	17 Jan 2008 20:54:49 -0000	1.19
--- CMakeGenericSystem.cmake	13 Jan 2009 18:03:49 -0000	1.19.2.1
***************
*** 27,35 ****
       "If set, runtime paths are not added when using shared libraries.")
  
! SET(CMAKE_INIT_VALUE FALSE)
! IF(CMAKE_GENERATOR MATCHES "KDevelop3")
!   SET(CMAKE_INIT_VALUE TRUE)
! ENDIF(CMAKE_GENERATOR MATCHES "KDevelop3")
! SET(CMAKE_VERBOSE_MAKEFILE ${CMAKE_INIT_VALUE} CACHE BOOL "If this value is on, makefiles will be generated without the .SILENT directive, and all commands will be echoed to the console during the make.  This is useful for debugging only. With Visual Studio IDE projects all commands are done without /nologo.") 
  
  IF(CMAKE_GENERATOR MATCHES "Makefiles")
--- 27,31 ----
       "If set, runtime paths are not added when using shared libraries.")
  
! SET(CMAKE_VERBOSE_MAKEFILE FALSE CACHE BOOL "If this value is on, makefiles will be generated without the .SILENT directive, and all commands will be echoed to the console during the make.  This is useful for debugging only. With Visual Studio IDE projects all commands are done without /nologo.") 
  
  IF(CMAKE_GENERATOR MATCHES "Makefiles")

Index: CMakeSystemSpecificInformation.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeSystemSpecificInformation.cmake,v
retrieving revision 1.40
retrieving revision 1.40.2.1
diff -C 2 -d -r1.40 -r1.40.2.1
*** CMakeSystemSpecificInformation.cmake	10 Aug 2007 13:07:39 -0000	1.40
--- CMakeSystemSpecificInformation.cmake	13 Jan 2009 18:03:49 -0000	1.40.2.1
***************
*** 30,34 ****
      CONFIGURE_FILE(${CMAKE_BINARY_DIR}/CMakeCache.txt
                     ${CMAKE_BINARY_DIR}/CopyOfCMakeCache.txt COPYONLY)
!     MESSAGE("You CMakeCache.txt file was copied to CopyOfCMakeCache.txt. " 
              "Please send that file to cmake at www.cmake.org.")
     ENDIF(EXISTS ${CMAKE_BINARY_DIR}/CMakeCache.txt)
--- 30,34 ----
      CONFIGURE_FILE(${CMAKE_BINARY_DIR}/CMakeCache.txt
                     ${CMAKE_BINARY_DIR}/CopyOfCMakeCache.txt COPYONLY)
!     MESSAGE("Your CMakeCache.txt file was copied to CopyOfCMakeCache.txt. " 
              "Please send that file to cmake at www.cmake.org.")
     ENDIF(EXISTS ${CMAKE_BINARY_DIR}/CMakeCache.txt)

Index: FindPythonInterp.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPythonInterp.cmake,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C 2 -d -r1.10 -r1.10.2.1
*** FindPythonInterp.cmake	30 Aug 2007 17:35:54 -0000	1.10
--- FindPythonInterp.cmake	13 Jan 2009 18:03:49 -0000	1.10.2.1
***************
*** 10,13 ****
--- 10,14 ----
    NAMES python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python
    PATHS
+   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]
    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]



More information about the Cmake-commits mailing list