[Cmake-commits] CMake branch, next, updated. v3.0.0-4146-g7a9c33d

[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  7a9c33d47919d0554e2bfb78442c3afc67b12bb1 (commit)
       via  16dd50960cb25552ce4c0242b8a23114d8846ccd (commit)
      from  f2fb31516ac8b563c0305169a95337551b60f016 (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=7a9c33d47919d0554e2bfb78442c3afc67b12bb1
commit 7a9c33d47919d0554e2bfb78442c3afc67b12bb1
Merge: f2fb315 16dd509
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 8 09:02:58 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 8 09:02:58 2014 -0400

    Merge topic 'allow-OBJECT-library-extra-sources' into next
    
    16dd5096 Tests: Workaround VS 6 problem in ObjectLibrary test


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=16dd50960cb25552ce4c0242b8a23114d8846ccd
commit 16dd50960cb25552ce4c0242b8a23114d8846ccd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 8 09:01:55 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 8 09:01:55 2014 -0400

    Tests: Workaround VS 6 problem in ObjectLibrary test

diff --git a/Tests/ObjectLibrary/A/CMakeLists.txt b/Tests/ObjectLibrary/A/CMakeLists.txt
index 696752f..c24c5ed 100644
--- a/Tests/ObjectLibrary/A/CMakeLists.txt
+++ b/Tests/ObjectLibrary/A/CMakeLists.txt
@@ -11,7 +11,12 @@ add_custom_command(
                                    ${CMAKE_CURRENT_BINARY_DIR}/a1.c
   )
 
-file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/a.cmake)
+# Remove the custom command output to be sure it runs in an
+# incremental test.  Skip this on VS 6 because it sometimes
+# re-runs CMake after the custom command runs.
+if(NOT CMAKE_GENERATOR STREQUAL "Visual Studio 6")
+  file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/a.cmake)
+endif()
 add_custom_command(
   OUTPUT a.cmake
   COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/a.cmake

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

Summary of changes:
 Tests/ObjectLibrary/A/CMakeLists.txt |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake