From faf6d82bd6b6d31887f1f909d3b46b5fd130a435 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 10 Dec 2009 11:19:23 -0500 Subject: [PATCH] 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. --- Tests/EnforceConfig.cmake.in | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/Tests/EnforceConfig.cmake.in b/Tests/EnforceConfig.cmake.in index 0340db016..c9028a391 100644 --- a/Tests/EnforceConfig.cmake.in +++ b/Tests/EnforceConfig.cmake.in @@ -5,20 +5,8 @@ ELSE(CTEST_CONFIGURATION_TYPE) SET(CTestTest_CONFIG "@CTestTest_CONFIG@") 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) +# 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) GET_FILENAME_COMPONENT(CTEST_EXE "${CTEST_CMD}" NAME) @@ -33,6 +21,6 @@ IF(NOT CTEST_CONFIGURATION_TYPE AND CONFIG_REQUIRED) SET(CTEST_CONFIGURATION_TYPE NoConfig) ENDIF(NOT CTEST_CONFIGURATION_TYPE) MESSAGE("Guessing configuration ${CTEST_CONFIGURATION_TYPE}") -ENDIF(NOT CTEST_CONFIGURATION_TYPE AND CONFIG_REQUIRED) +ENDIF(NOT CTEST_CONFIGURATION_TYPE) @TEST_HOME_ENV_CODE@