[Cmake-commits] CMake branch, next, updated. v3.5.1-865-g8554832

[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  8554832559700c8cda4ed2bdedfcd157addf9a94 (commit)
       via  29bb7c105fe1710fb600dbc44c4f32fa84c0019c (commit)
      from  286b92460e972aa3be28be15cbb494a345dcaba0 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8554832559700c8cda4ed2bdedfcd157addf9a94
commit 8554832559700c8cda4ed2bdedfcd157addf9a94
Merge: 286b924 29bb7c1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 8 08:43:45 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 8 08:43:45 2016 -0400

    Merge topic 'ninja-restat-custom-command-byproducts' into next
    
    29bb7c10 fixup! Ninja: Restat custom command byproducts even with a SYMBOLIC output


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=29bb7c105fe1710fb600dbc44c4f32fa84c0019c
commit 29bb7c105fe1710fb600dbc44c4f32fa84c0019c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 8 08:32:29 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 8 08:43:28 2016 -0400

    fixup! Ninja: Restat custom command byproducts even with a SYMBOLIC output

diff --git a/Tests/RunCMake/BuildDepends/Custom-Symbolic-and-Byproduct.cmake b/Tests/RunCMake/BuildDepends/Custom-Symbolic-and-Byproduct.cmake
index 8c16e05..687c827 100644
--- a/Tests/RunCMake/BuildDepends/Custom-Symbolic-and-Byproduct.cmake
+++ b/Tests/RunCMake/BuildDepends/Custom-Symbolic-and-Byproduct.cmake
@@ -2,7 +2,7 @@ add_custom_command(
   OUTPUT gen-byproduct gen-byproduct-stamp
   BYPRODUCTS byproduct
   COMMAND ${CMAKE_COMMAND} -E touch gen-byproduct-stamp
-  COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/main.c byproduct
+  COMMAND ${CMAKE_COMMAND} -E copy_if_different gen-byproduct-stamp byproduct
   )
 set_property(SOURCE gen-byproduct PROPERTY SYMBOLIC 1)
 add_custom_target(produce DEPENDS gen-byproduct)
@@ -10,6 +10,7 @@ add_custom_target(produce DEPENDS gen-byproduct)
 add_custom_command(
   OUTPUT use-byproduct
   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/byproduct
+  COMMAND ${CMAKE_COMMAND} -E sleep 1.125 # workaround buggy filesystem timestamps
   COMMAND ${CMAKE_COMMAND} -E touch use-byproduct
   )
 add_custom_target(drive ALL DEPENDS use-byproduct)

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

Summary of changes:
 Tests/RunCMake/BuildDepends/Custom-Symbolic-and-Byproduct.cmake |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake