Merge topic 'remove-compatibility-ctest'
4b67c4b9
Remove compatibility CTest code.
This commit is contained in:
commit
23a654706e
|
@ -164,8 +164,6 @@ macro(CMAKE_SETUP_TESTING)
|
||||||
${CMake_BINARY_DIR}/Modules/.NoDartCoverage)
|
${CMake_BINARY_DIR}/Modules/.NoDartCoverage)
|
||||||
configure_file(${CMake_SOURCE_DIR}/CTestCustom.cmake.in
|
configure_file(${CMake_SOURCE_DIR}/CTestCustom.cmake.in
|
||||||
${CMake_BINARY_DIR}/CTestCustom.cmake @ONLY)
|
${CMake_BINARY_DIR}/CTestCustom.cmake @ONLY)
|
||||||
configure_file(${CMake_SOURCE_DIR}/CTestCustom.ctest.in
|
|
||||||
${CMake_BINARY_DIR}/CTestCustom.ctest @ONLY)
|
|
||||||
if(BUILD_TESTING AND DART_ROOT)
|
if(BUILD_TESTING AND DART_ROOT)
|
||||||
configure_file(${CMake_SOURCE_DIR}/CMakeLogo.gif
|
configure_file(${CMake_SOURCE_DIR}/CMakeLogo.gif
|
||||||
${CMake_BINARY_DIR}/Testing/HTML/TestingResults/Icons/Logo.gif COPYONLY)
|
${CMake_BINARY_DIR}/Testing/HTML/TestingResults/Icons/Logo.gif COPYONLY)
|
||||||
|
|
|
@ -18,8 +18,3 @@ set(CTEST_DROP_LOCATION "/CDash/submit.php?project=CMake")
|
||||||
set(CTEST_DROP_SITE_CDASH TRUE)
|
set(CTEST_DROP_SITE_CDASH TRUE)
|
||||||
set(CTEST_CDASH_VERSION "1.6")
|
set(CTEST_CDASH_VERSION "1.6")
|
||||||
set(CTEST_CDASH_QUERY_VERSION TRUE)
|
set(CTEST_CDASH_QUERY_VERSION TRUE)
|
||||||
|
|
||||||
# use old trigger stuff so that cmake 2.4 and below will not
|
|
||||||
# get errors on trigger
|
|
||||||
set (TRIGGER_SITE
|
|
||||||
"http://public.kitware.com/cgi-bin/Submit-CMake-TestingResults.cgi")
|
|
||||||
|
|
|
@ -1,3 +0,0 @@
|
||||||
# This file is provided for compatibility with CMake 2.2 and lower.
|
|
||||||
# Just include the custom file by its new name.
|
|
||||||
INCLUDE("CTestCustom.cmake")
|
|
Loading…
Reference in New Issue