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 7f64cc5880012743332070bc908fa875ede019e4 (commit)
via cf3ca1fcdd31e7d0cf36e801d8dcd93b85a236f2 (commit)
from ea807b0f7db7e6b7115e97bb9361d5de070798e1 (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=7f64cc5880012743332070bc908fa875ede019e4
commit 7f64cc5880012743332070bc908fa875ede019e4
Merge: ea807b0 cf3ca1f
Author: Brad King <[email protected]>
AuthorDate: Wed Dec 17 08:47:34 2014 -0500
Commit: CMake Topic Stage <[email protected]>
CommitDate: Wed Dec 17 08:47:34 2014 -0500
Merge topic 'remove-stray-source-file' into next
cf3ca1fc Tests: Remove stray source file (temporary change)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cf3ca1fcdd31e7d0cf36e801d8dcd93b85a236f2
commit cf3ca1fcdd31e7d0cf36e801d8dcd93b85a236f2
Author: Brad King <[email protected]>
AuthorDate: Wed Dec 17 08:47:14 2014 -0500
Commit: Brad King <[email protected]>
CommitDate: Wed Dec 17 08:47:14 2014 -0500
Tests: Remove stray source file (temporary change)
A few dashboard machines have failed the CheckSourceTree test since
a stray file was accidentally left behind by one revision of a topic.
Add code to remove this file.
This change will not be merged to any branch except 'next'.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 7dc31d9..d2309f9 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -3087,4 +3087,4 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
endif()
# Remove a stray source file from a few dashboard machines.
-file(REMOVE
${CMAKE_CURRENT_SOURCE_DIR}/QtAutogen/autorcc_depends/res2_input.txt)
+file(REMOVE ${CMAKE_CURRENT_SOURCE_DIR}/ExternalProjectUpdate/core)
-----------------------------------------------------------------------
Summary of changes:
Tests/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/mailman/listinfo/cmake-commits
