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 a377ba7bb9c90ec0e811175842c3c69991647849 (commit)
via d92dd482ae06a0df8934b32f4ecad9bbf4254894 (commit)
from 33760f8c6a480864559e2294a776b263d20745ad (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=a377ba7bb9c90ec0e811175842c3c69991647849
commit a377ba7bb9c90ec0e811175842c3c69991647849
Merge: 33760f8 d92dd48
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Fri Feb 28 15:04:03 2014 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Feb 28 15:04:03 2014 -0500
Merge topic 'alt-test-generator' into next
d92dd482 Move some test related code around.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d92dd482ae06a0df8934b32f4ecad9bbf4254894
commit d92dd482ae06a0df8934b32f4ecad9bbf4254894
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Fri Feb 28 21:03:33 2014 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Fri Feb 28 21:03:33 2014 +0100
Move some test related code around.
Maybe this fixes the dashboards.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c0084c1..06277a1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -427,28 +427,10 @@ set(LIBRARY_OUTPUT_PATH "" CACHE INTERNAL
# install tree.
set(CMAKE_SKIP_RPATH ON CACHE INTERNAL "CMake does not need RPATHs.")
-CMAKE_SETUP_TESTING()
# Load install destinations.
include(Source/CMakeInstallDestinations.cmake)
-if (NOT CMAKE_TEST_GENERATOR STREQUAL CMAKE_GENERATOR
- OR NOT CMAKE_TEST_GENERATOR_TOOLSET STREQUAL CMAKE_GENERATOR_TOOLSET)
- set(CMake_TestAlternative "${CMAKE_TEST_GENERATOR}")
- if (CMAKE_TEST_GENERATOR_TOOLSET)
- set(CMake_TestAlternative
"${CMake_TestAlternative}_${CMAKE_TEST_GENERATOR_TOOLSET}")
- endif()
- if (NOT CMAKE_VERSION VERSION_LESS 2.8.12)
- string(MAKE_C_IDENTIFIER "${CMake_TestAlternative}" CMake_TestAlternative)
- endif()
- set(CMake_TestAlternative "${CMake_TestAlternative}/")
-endif()
-set(CMake_TestDir "${CMake_TestAlternative}Tests")
-
-if(BUILD_TESTING)
- include(${CMake_SOURCE_DIR}/Tests/CMakeInstall.cmake)
-endif()
-
# include special compile flags for some compilers
include(CompileFlags.cmake)
@@ -539,6 +521,24 @@ add_custom_target(uninstall
include (CMakeCPack.cmake)
# setup some Testing support (a macro defined in this file)
+CMAKE_SETUP_TESTING()
+if (NOT CMAKE_TEST_GENERATOR STREQUAL CMAKE_GENERATOR
+ OR NOT CMAKE_TEST_GENERATOR_TOOLSET STREQUAL CMAKE_GENERATOR_TOOLSET)
+ set(CMake_TestAlternative "${CMAKE_TEST_GENERATOR}")
+ if (CMAKE_TEST_GENERATOR_TOOLSET)
+ set(CMake_TestAlternative
"${CMake_TestAlternative}_${CMAKE_TEST_GENERATOR_TOOLSET}")
+ endif()
+ if (NOT CMAKE_VERSION VERSION_LESS 2.8.12)
+ string(MAKE_C_IDENTIFIER "${CMake_TestAlternative}" CMake_TestAlternative)
+ endif()
+ set(CMake_TestAlternative "${CMake_TestAlternative}/")
+endif()
+set(CMake_TestDir "${CMake_TestAlternative}Tests")
+
+if(BUILD_TESTING)
+ include(${CMake_SOURCE_DIR}/Tests/CMakeInstall.cmake)
+endif()
+
configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/DartLocal.conf.in"
"${CMAKE_CURRENT_BINARY_DIR}/DartLocal.conf"
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
