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 cb0ecc95d7da20b651f9e14e24235499a161a4b0 (commit)
via 96aa6060d3db0e5d076b81627d4b4c18e3c6247d (commit)
from afac7f22cea21995c6dde1d184e4ab3c0aefc055 (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=cb0ecc95d7da20b651f9e14e24235499a161a4b0
commit cb0ecc95d7da20b651f9e14e24235499a161a4b0
Merge: afac7f2 96aa606
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Tue Sep 23 10:30:57 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Sep 23 10:30:57 2014 -0400
Merge topic 'autorcc-depends' into next
96aa6060 Add file paths to debug output.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=96aa6060d3db0e5d076b81627d4b4c18e3c6247d
commit 96aa6060d3db0e5d076b81627d4b4c18e3c6247d
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Tue Sep 23 16:30:44 2014 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Tue Sep 23 16:30:44 2014 +0200
Add file paths to debug output.
diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index 5b3a137..6e13fae 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -142,10 +142,10 @@ file(TIMESTAMP "${qrc_file1}" file1_step1 "${timeformat}")
file(TIMESTAMP "${qrc_file2}" file2_step1 "${timeformat}")
if (NOT file2_step1 STREQUAL file2_before)
- message(SEND_ERROR "file2 should not have changed in the first step!")
+ message(SEND_ERROR "file2 (${qrc_file2}) should not have changed in the
first step!")
endif()
if (NOT file1_step1 GREATER file1_before)
- message(SEND_ERROR "file1 should have changed in the first step!")
+ message(SEND_ERROR "file1 (${qrc_file1}) should have changed in the first
step!")
endif()
execute_process(COMMAND "${CMAKE_COMMAND}" -E touch
"${CMAKE_CURRENT_SOURCE_DIR}/autorcc_depends/res2_input.txt")
@@ -159,8 +159,8 @@ file(TIMESTAMP "${qrc_file1}" file1_step2 "${timeformat}")
file(TIMESTAMP "${qrc_file2}" file2_step2 "${timeformat}")
if (NOT file1_step2 STREQUAL file1_step1)
- message(SEND_ERROR "file1 should not have changed in the second step!")
+ message(SEND_ERROR "file1 (${qrc_file1}) should not have changed in the
second step!")
endif()
if (NOT file2_step2 GREATER file2_before)
- message(SEND_ERROR "file2 should have changed in the second step!")
+ message(SEND_ERROR "file2 (${qrc_file2}) should have changed in the second
step!")
endif()
-----------------------------------------------------------------------
Summary of changes:
Tests/QtAutogen/CMakeLists.txt | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
