[Cmake-commits] CMake branch, next, updated. v2.8.12.1-7108-g0d00790
Rolf Eike Beer
eike at sf-mail.de
Tue Jan 14 17:57:30 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 0d00790bab6477d172c34d662de82fe4d810bb0d (commit)
via 44cf287a03f3fe31ed8d24f3d708a2f84c581ba8 (commit)
from 6082047484e8d8957f3b68fe67113582b7100fac (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=0d00790bab6477d172c34d662de82fe4d810bb0d
commit 0d00790bab6477d172c34d662de82fe4d810bb0d
Merge: 6082047 44cf287
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Jan 14 17:57:29 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 14 17:57:29 2014 -0500
Merge topic 'skip-return-code' into next
44cf287a add config type
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=44cf287a03f3fe31ed8d24f3d708a2f84c581ba8
commit 44cf287a03f3fe31ed8d24f3d708a2f84c581ba8
Author: Rolf Eike Beer <kde at opensource.sf-tec.de>
AuthorDate: Tue Jan 14 23:57:20 2014 +0100
Commit: Rolf Eike Beer <kde at opensource.sf-tec.de>
CommitDate: Tue Jan 14 23:57:20 2014 +0100
add config type
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 8b2db1b..a79111a 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2237,6 +2237,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
add_test(CTestTestSkipReturnCode ${CMAKE_CTEST_COMMAND}
-S "${CMake_BINARY_DIR}/Tests/CTestTestSkipReturnCode/test.cmake" -V
--output-log "${CMake_BINARY_DIR}/Tests/CTestTestSkipReturnCode/testOutput.log"
+ -C \${CTEST_CONFIGURATION_TYPE}
)
set_tests_properties(CTestTestSkipReturnCode PROPERTIES
PASS_REGULAR_EXPRESSION "CMakeV1 \\.* +Passed.*CMakeV2 \\.+\\*+Skipped")
-----------------------------------------------------------------------
Summary of changes:
Tests/CMakeLists.txt | 1 +
1 file changed, 1 insertion(+)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list