[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2510-g6675cb9
Brad King
brad.king at kitware.com
Wed Mar 13 14:13:21 EDT 2013
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 6675cb980745e8ecbfd476a4a209cf3161a4dbf3 (commit)
via dd8a06bd654e39d4ffba211431b75a8ad2ac0d6a (commit)
from 85f247b1ceea16de9774c04602b2e2fd597b3142 (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=6675cb980745e8ecbfd476a4a209cf3161a4dbf3
commit 6675cb980745e8ecbfd476a4a209cf3161a4dbf3
Merge: 85f247b dd8a06b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 13 14:13:18 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 13 14:13:18 2013 -0400
Merge topic 'configure-no-tests' into next
dd8a06b Configure Tests/CMakeTests only with BUILD_TESTING ON
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dd8a06bd654e39d4ffba211431b75a8ad2ac0d6a
commit dd8a06bd654e39d4ffba211431b75a8ad2ac0d6a
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 13 14:09:43 2013 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 13 14:09:43 2013 -0400
Configure Tests/CMakeTests only with BUILD_TESTING ON
Since commit e03f83f3 (ProcessorCount test: fix path to cmsysTestsCxx
executable, 2013-01-24) the directory references a target that is not
built when BUILD_TESTING is OFF. It makes no sense to add tests without
BUILD_TESTING anyway.
While at it, use add_subdirectory instead of subdirs to add CMakeTests.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 5982e8b..e07bb69 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2442,6 +2442,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
set_tests_properties(KWStyle PROPERTIES
WORKING_DIRECTORY ${CMake_BINARY_DIR}/Utilities/KWStyle)
endif()
-endif()
-subdirs(CMakeTests)
+ add_subdirectory(CMakeTests)
+endif()
-----------------------------------------------------------------------
Summary of changes:
Tests/CMakeLists.txt | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list