[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1832-g2889815

Stephen Kelly steveire at gmail.com
Fri Feb 28 08:56:14 EST 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  28898157851e68f13dc4267164c1815d0a28bab8 (commit)
       via  4b67c4b94cc38814c4ff441b4a2f5cf792725485 (commit)
      from  9c9c50c27112726a50cafc69b6ac83541981bc55 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=28898157851e68f13dc4267164c1815d0a28bab8
commit 28898157851e68f13dc4267164c1815d0a28bab8
Merge: 9c9c50c 4b67c4b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 28 08:56:13 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 28 08:56:13 2014 -0500

    Merge topic 'remove-compatibility-ctest' into next
    
    4b67c4b9 Remove compatibility CTest code.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4b67c4b94cc38814c4ff441b4a2f5cf792725485
commit 4b67c4b94cc38814c4ff441b4a2f5cf792725485
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 28 14:52:40 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 28 14:55:47 2014 +0100

    Remove compatibility CTest code.

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")

-----------------------------------------------------------------------

Summary of changes:
 CMakeLists.txt       |    2 --
 CTestConfig.cmake    |    5 -----
 CTestCustom.ctest.in |    3 ---
 3 files changed, 10 deletions(-)
 delete mode 100644 CTestCustom.ctest.in


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list