[Cmake-commits] [cmake-commits] king committed EnforceConfig.cmake.in 1.4 1.5

[cmake-commits at cmake.org]

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

Modified Files:
	EnforceConfig.cmake.in 
Log Message:
Always use a configuration for CMake tests

Previously our EnforceConfig script that loads at test-time would only
enforce a non-empty CTEST_CONFIGURATION_TYPE for CMake 2.6.2 and lower.
Now we simply always enforce use of a configuration, and select one of
the configurations that was built if none is given.

This is necessary to run tests like CMake.Install that need to know the
configuration with which CMake was built.


Index: EnforceConfig.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/EnforceConfig.cmake.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** EnforceConfig.cmake.in	1 Dec 2009 14:12:07 -0000	1.4
--- EnforceConfig.cmake.in	10 Dec 2009 16:19:23 -0000	1.5
***************
*** 6,23 ****
  ENDIF(CTEST_CONFIGURATION_TYPE)
  
! # Older versions of CMake do not support an empty configuration name in
! # CTEST_CONFIGURATION_TYPE for the 'testing' test.
! SET(CONFIG_REQUIRED)
! IF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.6)
!   SET(CONFIG_REQUIRED 1)
! ELSE("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.6)
!   IF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" STREQUAL 2.6)
!     IF("${CMAKE_PATCH_VERSION}" LESS 3)
!       SET(CONFIG_REQUIRED 1)
!    ENDIF("${CMAKE_PATCH_VERSION}" LESS 3)
!   ENDIF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" STREQUAL 2.6)
! ENDIF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.6)
! 
! IF(NOT CTEST_CONFIGURATION_TYPE AND CONFIG_REQUIRED)
    SET(CTEST_CMD "@CMAKE_CTEST_COMMAND@@CMAKE_EXECUTABLE_SUFFIX@")
    GET_FILENAME_COMPONENT(CTEST_DIR "${CTEST_CMD}" PATH)
--- 6,11 ----
  ENDIF(CTEST_CONFIGURATION_TYPE)
  
! # Choose a configuration that was built if none is given.
! IF(NOT CTEST_CONFIGURATION_TYPE)
    SET(CTEST_CMD "@CMAKE_CTEST_COMMAND@@CMAKE_EXECUTABLE_SUFFIX@")
    GET_FILENAME_COMPONENT(CTEST_DIR "${CTEST_CMD}" PATH)
***************
*** 34,38 ****
    ENDIF(NOT CTEST_CONFIGURATION_TYPE)
    MESSAGE("Guessing configuration ${CTEST_CONFIGURATION_TYPE}")
! ENDIF(NOT CTEST_CONFIGURATION_TYPE AND CONFIG_REQUIRED)
  
  @TEST_HOME_ENV_CODE@
--- 22,26 ----
    ENDIF(NOT CTEST_CONFIGURATION_TYPE)
    MESSAGE("Guessing configuration ${CTEST_CONFIGURATION_TYPE}")
! ENDIF(NOT CTEST_CONFIGURATION_TYPE)
  
  @TEST_HOME_ENV_CODE@