[Cmake-commits] [cmake-commits] hoffman committed CTest.cmake 1.10.2.1 1.10.2.2 FindQt4.cmake 1.96.2.7 1.96.2.8 FindX11.cmake 1.31.2.1 1.31.2.2 GetPrerequisites.cmake 1.1 1.1.2.1

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	CTest.cmake FindQt4.cmake FindX11.cmake GetPrerequisites.cmake 
Log Message:
ENH: merge from main tree


Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.96.2.7
retrieving revision 1.96.2.8
diff -C 2 -d -r1.96.2.7 -r1.96.2.8
*** FindQt4.cmake	10 Apr 2008 16:43:49 -0000	1.96.2.7
--- FindQt4.cmake	4 May 2008 22:07:27 -0000	1.96.2.8
***************
*** 646,649 ****
--- 646,650 ----
      PATHS
      ${QT_INCLUDE_DIR}/QtDBus
+     ${QT_LIBRARY_DIR}/QtDBus.framework/Headers
      NO_DEFAULT_PATH
      )
***************
*** 685,688 ****
--- 686,690 ----
      PATHS
      ${QT_INCLUDE_DIR}/phonon
+     ${QT_LIBRARY_DIR}/phonon.framework/Headers
      NO_DEFAULT_PATH
      )

Index: CTest.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CTest.cmake,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -C 2 -d -r1.10.2.1 -r1.10.2.2
*** CTest.cmake	18 Mar 2008 14:23:51 -0000	1.10.2.1
--- CTest.cmake	4 May 2008 22:07:27 -0000	1.10.2.2
***************
*** 12,15 ****
--- 12,27 ----
  OPTION(BUILD_TESTING "Build the testing tree." ON)
  
+ # function to turn generator name into a version string
+ # like vs7 vs71 vs8 vs9 
+ FUNCTION(GET_VS_VERSION_STRING generator var)
+   STRING(REGEX REPLACE "Visual Studio ([0-9][0-9]?)($|.*)" "\\1" NUMBER "${generator}") 
+   IF("${generator}" MATCHES "Visual Studio 7 .NET 2003")
+     SET(ver_string "vs71")
+   ELSE("${generator}" MATCHES "Visual Studio 7 .NET 2003")
+     SET(ver_string "vs${NUMBER}")
+   ENDIF("${generator}" MATCHES "Visual Studio 7 .NET 2003")
+   SET(${var} ${ver_string} PARENT_SCOPE)
+ ENDFUNCTION(GET_VS_VERSION_STRING)
+ 
  IF(BUILD_TESTING)
    # Setup some auxilary macros
***************
*** 172,184 ****
      ENDIF(DART_CXX_NAME MATCHES "msdev")
      IF(DART_CXX_NAME MATCHES "devenv")
!       IF(CMAKE_GENERATOR MATCHES "^Visual Studio 7$")
!         SET(DART_CXX_NAME "vs70")
!       ELSE(CMAKE_GENERATOR MATCHES "^Visual Studio 7$")
!         IF(CMAKE_GENERATOR MATCHES "^Visual Studio 7 .NET 2003$")
!           SET(DART_CXX_NAME "vs71")
!         ELSE(CMAKE_GENERATOR MATCHES "^Visual Studio 7 .NET 2003$")
!           SET(DART_CXX_NAME "vs8")
!         ENDIF(CMAKE_GENERATOR MATCHES "^Visual Studio 7 .NET 2003$")
!       ENDIF(CMAKE_GENERATOR MATCHES "^Visual Studio 7$")
      ENDIF(DART_CXX_NAME MATCHES "devenv")
      SET(BUILDNAME "${BUILD_NAME_SYSTEM_NAME}-${DART_CXX_NAME}")
--- 184,188 ----
      ENDIF(DART_CXX_NAME MATCHES "msdev")
      IF(DART_CXX_NAME MATCHES "devenv")
!       GET_VS_VERSION_STRING("${CMAKE_GENERATOR}" DART_CXX_NAME)
      ENDIF(DART_CXX_NAME MATCHES "devenv")
      SET(BUILDNAME "${BUILD_NAME_SYSTEM_NAME}-${DART_CXX_NAME}")

Index: GetPrerequisites.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/GetPrerequisites.cmake,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C 2 -d -r1.1 -r1.1.2.1
*** GetPrerequisites.cmake	4 Mar 2008 13:18:40 -0000	1.1
--- GetPrerequisites.cmake	4 May 2008 22:07:27 -0000	1.1.2.1
***************
*** 252,255 ****
--- 252,256 ----
      set(gp_regex_cmp_count 1)
      set(gp_tool_known 1)
+     set(ENV{VS_UNICODE_OUTPUT} "") # Block extra output from inside VS IDE.
    endif("${gp_tool}" STREQUAL "dumpbin")
  

Index: FindX11.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindX11.cmake,v
retrieving revision 1.31.2.1
retrieving revision 1.31.2.2
diff -C 2 -d -r1.31.2.1 -r1.31.2.2
*** FindX11.cmake	18 Mar 2008 14:23:52 -0000	1.31.2.1
--- FindX11.cmake	4 May 2008 22:07:27 -0000	1.31.2.2
***************
*** 418,421 ****
--- 418,422 ----
      X11_ICE_LIB
      X11_ICE_INCLUDE_PATH
+     X11_SM_LIB
    )
    SET(CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK_SAVE})