[Cmake-commits] CMake branch, next, updated. v3.6.2-2168-g4e952da
Stephen Kelly
steveire at gmail.com
Sat Sep 17 06:15:32 EDT 2016
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 4e952dabb663c8c65844d608d76f7bb7c691ab00 (commit)
via d4f89562594107111e197d4022546ec2c033fe4f (commit)
from fe8976265416da8333cd7497d8d41db177b23769 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4e952dabb663c8c65844d608d76f7bb7c691ab00
commit 4e952dabb663c8c65844d608d76f7bb7c691ab00
Merge: fe89762 d4f8956
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Sep 17 06:15:31 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Sep 17 06:15:31 2016 -0400
Merge topic 'predictable-add_custom_command-output' into next
d4f89562 fixup! Make the add_custom_command output more predictable
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4f89562594107111e197d4022546ec2c033fe4f
commit d4f89562594107111e197d4022546ec2c033fe4f
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Sep 17 12:15:11 2016 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Sep 17 12:15:11 2016 +0200
fixup! Make the add_custom_command output more predictable
diff --git a/Tests/RunCMake/add_custom_command/AppendNotOutput-stderr.txt b/Tests/RunCMake/add_custom_command/AppendNotOutput-stderr.txt
index b643b57..cd542d8 100644
--- a/Tests/RunCMake/add_custom_command/AppendNotOutput-stderr.txt
+++ b/Tests/RunCMake/add_custom_command/AppendNotOutput-stderr.txt
@@ -1,7 +1,7 @@
CMake Error at AppendNotOutput.cmake:1 \(add_custom_command\):
add_custom_command given APPEND option with output
- ".*RunCMake/add_custom_command/AppendNotOutput-build/out"
+ .*RunCMake/add_custom_command/AppendNotOutput-build/out.*
which is not already a custom command output.
Call Stack \(most recent call first\):
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/add_custom_command/AppendNotOutput-stderr.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list