[Cmake-commits] CMake branch, next, updated. v3.5.2-1151-g7026a45

[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  7026a451c7f7ed69095de04a9415b7f9bf38f5bd (commit)
       via  47c298851bb172af1c5afd208fa62524d763f91a (commit)
      from  47be51557ad4a5396c4b5fd231537c308cd637ae (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=7026a451c7f7ed69095de04a9415b7f9bf38f5bd
commit 7026a451c7f7ed69095de04a9415b7f9bf38f5bd
Merge: 47be515 47c2988
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 29 11:48:22 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 29 11:48:22 2016 -0400

    Merge topic 'test-watcom-workaround' into next
    
    47c29885 Tests: Fix RunCMake.BuildDepends filesystem delay for Watcom WMake


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=47c298851bb172af1c5afd208fa62524d763f91a
commit 47c298851bb172af1c5afd208fa62524d763f91a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 29 11:47:35 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 29 11:47:35 2016 -0400

    Tests: Fix RunCMake.BuildDepends filesystem delay for Watcom WMake
    
    Our 1.125s delay does not seem to be long enough to be reliable with
    the Watcom `wmake` tool.  Use a longer delay for Watcom.

diff --git a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
index 8541070..ffd3ae1 100644
--- a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
+++ b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
@@ -1,6 +1,7 @@
 include(RunCMake)
 
-if(RunCMake_GENERATOR STREQUAL "Borland Makefiles")
+if(RunCMake_GENERATOR STREQUAL "Borland Makefiles" OR
+   RunCMake_GENERATOR STREQUAL "Watcom WMake")
   set(fs_delay 3)
 else()
   set(fs_delay 1.125)

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

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


hooks/post-receive
-- 
CMake