[Cmake-commits] CMake branch, next, updated. v3.5.1-881-gb444ad4
Brad King
brad.king at kitware.com
Fri Apr 8 09:11:49 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 b444ad46b3185638355575c65da0b8df29f52f60 (commit)
via d04b4425e7a6bfce748c064d1fb99ccbe9fffbfa (commit)
from 334ecf8dd559b07d100175a53965e0cf858676d7 (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=b444ad46b3185638355575c65da0b8df29f52f60
commit b444ad46b3185638355575c65da0b8df29f52f60
Merge: 334ecf8 d04b442
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 8 09:11:49 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 8 09:11:49 2016 -0400
Merge topic 'test-RunCMake.BuildDepends-filesystem-workaround' into next
d04b4425 Tests: Work around filesystem timestamp bugs in RunCMake.BuildDepends
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d04b4425e7a6bfce748c064d1fb99ccbe9fffbfa
commit d04b4425e7a6bfce748c064d1fb99ccbe9fffbfa
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 09:07:49 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`.
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