[Cmake-commits] CMake branch, next, updated. v3.0.1-5086-g4d85cc8
Nils Gladitz
nilsgladitz at gmail.com
Tue Sep 2 02:53:29 EDT 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 4d85cc8398555c82938e54afe2b79845d5962fae (commit)
via d42f2cbac7564d47451d0503027baab26da0e09f (commit)
from 19b17e61df12fd21bae28b53b1c1231edb9c0e00 (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=4d85cc8398555c82938e54afe2b79845d5962fae
commit 4d85cc8398555c82938e54afe2b79845d5962fae
Merge: 19b17e6 d42f2cb
Author: Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Sep 2 02:53:28 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 2 02:53:28 2014 -0400
Merge topic 'wix-log-on-failure' into next
d42f2cba CPackWIX: Revert NAME/COMMAND signature change
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d42f2cbac7564d47451d0503027baab26da0e09f
commit d42f2cbac7564d47451d0503027baab26da0e09f
Author: Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Sep 2 08:52:35 2014 +0200
Commit: Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Tue Sep 2 08:52:35 2014 +0200
CPackWIX: Revert NAME/COMMAND signature change
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 8964fbe..c22170f 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -851,7 +851,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
DOC "WiX Toolset light.exe location")
if(WIX_LIGHT_EXECUTABLE)
- add_test(NAME CPackWiXGenerator COMMAND ${CMAKE_CTEST_COMMAND}
+ add_test(CPackWiXGenerator ${CMAKE_CTEST_COMMAND}
-C \${CTEST_CONFIGURATION_TYPE}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/CPackWiXGenerator"
-----------------------------------------------------------------------
Summary of changes:
Tests/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list