[Cmake-commits] [cmake-commits] hoffman committed CTest.cmake 1.11 1.12

[cmake-commits at cmake.org]

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

Modified Files:
	CTest.cmake 
Log Message:
ENH: recognize vs 9 and possible 10 or greater when they come out...


Index: CTest.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CTest.cmake,v
retrieving revision 1.11
retrieving revision 1.12
diff -C 2 -d -r1.11 -r1.12
*** CTest.cmake	17 Mar 2008 15:10:32 -0000	1.11
--- CTest.cmake	2 May 2008 15:25:25 -0000	1.12
***************
*** 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}")