[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-401-g882f27a
Stephen Kelly
steveire at gmail.com
Fri Feb 28 15:13:06 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 882f27a57b2b069925790ec2228cffb8307268c5 (commit)
via d69ff942b4f4283ce66692d5b9275eed9ea0288f (commit)
via d0835f87d5c634035601283fc11158b113faafd2 (commit)
via c02b4f002a3aa5e78e97a04482a5a55b4b99c4bc (commit)
from a377ba7bb9c90ec0e811175842c3c69991647849 (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=882f27a57b2b069925790ec2228cffb8307268c5
commit 882f27a57b2b069925790ec2228cffb8307268c5
Merge: a377ba7 d69ff94
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 28 15:13:05 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 28 15:13:05 2014 -0500
Merge topic 'alt-test-generator' into next
d69ff942 Revert "Move the invocation of the CMAKE_SETUP_TESTING macro."
d0835f87 Revert "Tests: Build alt-test-generator tests in a separate binary dir."
c02b4f00 Revert "Move some test related code around."
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d69ff942b4f4283ce66692d5b9275eed9ea0288f
commit d69ff942b4f4283ce66692d5b9275eed9ea0288f
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 28 21:12:43 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 28 21:12:43 2014 +0100
Revert "Move the invocation of the CMAKE_SETUP_TESTING macro."
This reverts commit 4746a1d8257e2663845ec952c0faf9e6689d29ae.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c5808e..761ad20 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -427,8 +427,6 @@ 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)
@@ -526,6 +524,7 @@ add_custom_target(uninstall
include (CMakeCPack.cmake)
# setup some Testing support (a macro defined in this file)
+CMAKE_SETUP_TESTING()
configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/DartLocal.conf.in"
"${CMAKE_CURRENT_BINARY_DIR}/DartLocal.conf"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0835f87d5c634035601283fc11158b113faafd2
commit d0835f87d5c634035601283fc11158b113faafd2
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 28 21:12:39 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 28 21:12:39 2014 +0100
Revert "Tests: Build alt-test-generator tests in a separate binary dir."
This reverts commit 727f4badde1a74652b20ea775277bf968e72b8d1.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c0084c1..6c5808e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -432,19 +432,6 @@ 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()
@@ -571,10 +558,10 @@ endif()
# build the remaining subdirectories
add_subdirectory(Source)
add_subdirectory(Utilities)
-add_subdirectory(Tests ${CMake_TestDir})
+add_subdirectory(Tests)
if(BUILD_TESTING)
- CMAKE_SET_TARGET_FOLDER(CMakeLibTests "${CMake_TestDir}")
+ CMAKE_SET_TARGET_FOLDER(CMakeLibTests "Tests")
endif()
CMAKE_SET_TARGET_FOLDER(cmw9xcom "Utilities/Win9xCompat")
if(TARGET documentation)
diff --git a/Tests/CMakeInstall.cmake b/Tests/CMakeInstall.cmake
index 3c2135c..fda8c54 100644
--- a/Tests/CMakeInstall.cmake
+++ b/Tests/CMakeInstall.cmake
@@ -11,7 +11,7 @@ if(CMake_TEST_INSTALL)
set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY 1)
# Install to a test directory.
- set(CMake_TEST_INSTALL_PREFIX ${CMake_BINARY_DIR}/${CMake_TestDir}/CMakeInstall)
+ set(CMake_TEST_INSTALL_PREFIX ${CMake_BINARY_DIR}/Tests/CMakeInstall)
set(CMAKE_INSTALL_PREFIX "${CMake_TEST_INSTALL_PREFIX}")
if(CMAKE_CONFIGURATION_TYPES)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c02b4f002a3aa5e78e97a04482a5a55b4b99c4bc
commit c02b4f002a3aa5e78e97a04482a5a55b4b99c4bc
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Feb 28 21:12:36 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Feb 28 21:12:36 2014 +0100
Revert "Move some test related code around."
This reverts commit d92dd482ae06a0df8934b32f4ecad9bbf4254894.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 06277a1..c0084c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -427,10 +427,28 @@ 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)
@@ -521,24 +539,6 @@ 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 | 26 ++++++--------------------
Tests/CMakeInstall.cmake | 2 +-
2 files changed, 7 insertions(+), 21 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list