[Cmake-commits] CMake branch, next, updated. v3.2.2-2034-g7221fa4

[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  7221fa4b173552a7845519b94502530dff68947a (commit)
       via  e486db2738710cf784f15cf74a4f60a16e86da34 (commit)
      from  a9cca369d6a063f0e78fa6b34245479c88753869 (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=7221fa4b173552a7845519b94502530dff68947a
commit 7221fa4b173552a7845519b94502530dff68947a
Merge: a9cca36 e486db2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 22 08:48:24 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 22 08:48:24 2015 -0400

    Merge topic 'ExternalProject-depend-INTERFACE' into next
    
    e486db27 fixup! ExternalProject: Allow dependencies on INTERFACE libraries


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e486db2738710cf784f15cf74a4f60a16e86da34
commit e486db2738710cf784f15cf74a4f60a16e86da34
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 22 08:47:52 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Apr 22 08:47:52 2015 -0400

    fixup! ExternalProject: Allow dependencies on INTERFACE libraries

diff --git a/Tests/ExternalProjectSubdir/CMakeLists.txt b/Tests/ExternalProjectSubdir/CMakeLists.txt
index d2ce0be..e65087a 100644
--- a/Tests/ExternalProjectSubdir/CMakeLists.txt
+++ b/Tests/ExternalProjectSubdir/CMakeLists.txt
@@ -2,7 +2,13 @@ cmake_minimum_required(VERSION 3.2)
 project(ExternalProjectSubdir NONE)
 include(ExternalProject)
 
-file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/PreSubdir1.txt)
+# Remove the custom target 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}/PreSubdir1.txt)
+endif()
+
 add_custom_target(PreSubdir1
   COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/PreSubdir1.txt
   )

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

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


hooks/post-receive
-- 
CMake