[Cmake-commits] CMake branch, next, updated. v3.5.1-885-g2d6926e
Brad King
brad.king at kitware.com
Fri Apr 8 10:51:23 EDT 2016
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 2d6926e6c6d755a5839460fc64b95f1920e9569a (commit)
via f5e79004e28195f51cba4baff01615f6ce29b5bf (commit)
from 2f87082da96c6fa439ca2d913c7c63e527bc97f3 (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=2d6926e6c6d755a5839460fc64b95f1920e9569a
commit 2d6926e6c6d755a5839460fc64b95f1920e9569a
Merge: 2f87082 f5e7900
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 8 10:51:22 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 8 10:51:22 2016 -0400
Merge topic 'test-RunCMake.BuildDepends-filesystem-workaround' into next
f5e79004 Tests: Work around filesystem timestamp bugs in RunCMake.BuildDepends
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f5e79004e28195f51cba4baff01615f6ce29b5bf
commit f5e79004e28195f51cba4baff01615f6ce29b5bf
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 6 13:40:10 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 8 10:51:01 2016 -0400
Tests: Work around filesystem timestamp bugs in RunCMake.BuildDepends
The Custom-Symbolic-and-Byproduct case fails strangely on some
filesystems used by our nightly testing. Somehow on the first build the
`use-byproduct` output ends up with a timestamp older than
`gen-byproduct-stamp` even though the build log clearly shows them build
in the correct order (and must according to build system dependencies).
Work around this problem by adding an extra delay before building
`use-byproduct`.
Tested-by: Gerhard Grimm <gerhard.grimm at detec.com>
diff --git a/Tests/RunCMake/BuildDepends/Custom-Symbolic-and-Byproduct.cmake b/Tests/RunCMake/BuildDepends/Custom-Symbolic-and-Byproduct.cmake
index 6948c35..687c827 100644
--- a/Tests/RunCMake/BuildDepends/Custom-Symbolic-and-Byproduct.cmake
+++ b/Tests/RunCMake/BuildDepends/Custom-Symbolic-and-Byproduct.cmake
@@ -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:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list