[Cmake-commits] CMake branch, next, updated. v3.1.0-rc3-1195-g708c33b

[Brad King]

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  708c33bbcc11707f9ac80829aff2556ca750d089 (commit)
       via  ca67465742b141af67f7c00db3045af12f4663f1 (commit)
      from  602f6185809d86bbbb52c6db44092e46ac48475c (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=708c33bbcc11707f9ac80829aff2556ca750d089
commit 708c33bbcc11707f9ac80829aff2556ca750d089
Merge: 602f618 ca67465
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 16 14:42:32 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 16 14:42:32 2014 -0500

    Merge topic 'remove-stray-source-file' into next
    
    ca674657 Tests: Remove stray source file (temporary change)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ca67465742b141af67f7c00db3045af12f4663f1
commit ca67465742b141af67f7c00db3045af12f4663f1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 16 14:40:58 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Dec 16 14:40:58 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 33c18ce..7dc31d9 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -3085,3 +3085,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
     add_subdirectory(CMakeTests)
   endif()
 endif()
+
+# Remove a stray source file from a few dashboard machines.
+file(REMOVE ${CMAKE_CURRENT_SOURCE_DIR}/QtAutogen/autorcc_depends/res2_input.txt)

-----------------------------------------------------------------------

Summary of changes:
 Tests/CMakeLists.txt |    3 +++
 1 file changed, 3 insertions(+)


hooks/post-receive
-- 
CMake