diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-03 15:06:23 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-03-03 15:06:23 (GMT) |
| commit | 23a654706e74de514bb75a4b292ebfeff8686c77 (patch) | |
| tree | 1c8730225295f71158c6908356fe1309581dbd17 | |
| parent | ae215492cfe912c5d59e3a6314b3a476cc824d6e (diff) | |
| parent | 4b67c4b94cc38814c4ff441b4a2f5cf792725485 (diff) | |
| download | CMake-23a654706e74de514bb75a4b292ebfeff8686c77.zip CMake-23a654706e74de514bb75a4b292ebfeff8686c77.tar.gz CMake-23a654706e74de514bb75a4b292ebfeff8686c77.tar.bz2 | |
Merge topic 'remove-compatibility-ctest'
4b67c4b9 Remove compatibility CTest code.
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | CTestConfig.cmake | 5 | ||||
| -rw-r--r-- | CTestCustom.ctest.in | 3 |
3 files changed, 0 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 761ad20..9e1e7c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -164,8 +164,6 @@ macro(CMAKE_SETUP_TESTING) ${CMake_BINARY_DIR}/Modules/.NoDartCoverage) configure_file(${CMake_SOURCE_DIR}/CTestCustom.cmake.in ${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) configure_file(${CMake_SOURCE_DIR}/CMakeLogo.gif ${CMake_BINARY_DIR}/Testing/HTML/TestingResults/Icons/Logo.gif COPYONLY) diff --git a/CTestConfig.cmake b/CTestConfig.cmake index 92eacd8..819f9ba 100644 --- a/CTestConfig.cmake +++ b/CTestConfig.cmake @@ -18,8 +18,3 @@ set(CTEST_DROP_LOCATION "/CDash/submit.php?project=CMake") set(CTEST_DROP_SITE_CDASH TRUE) set(CTEST_CDASH_VERSION "1.6") 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") diff --git a/CTestCustom.ctest.in b/CTestCustom.ctest.in deleted file mode 100644 index 6127843..0000000 --- a/CTestCustom.ctest.in +++ /dev/null @@ -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") |