[Cmake-commits] CMake branch, next, updated. v3.3.1-3018-gf1a93c6

[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  f1a93c6a3bd676834bf2f88b983e6eca4e1e3072 (commit)
       via  c03af46e3e69ad8279d8ba9b5f353b92b87f3296 (commit)
      from  92313fa5d52220bd667ca0f9c290064940d3070a (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=f1a93c6a3bd676834bf2f88b983e6eca4e1e3072
commit f1a93c6a3bd676834bf2f88b983e6eca4e1e3072
Merge: 92313fa c03af46
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 17 09:41:13 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 17 09:41:13 2015 -0400

    Merge topic 'ms-manifest-files' into next
    
    c03af46e fixup! Tests: Add RunCMake.BuildDepends test


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c03af46e3e69ad8279d8ba9b5f353b92b87f3296
commit c03af46e3e69ad8279d8ba9b5f353b92b87f3296
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 17 09:37:32 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Sep 17 09:37:32 2015 -0400

    fixup! Tests: Add RunCMake.BuildDepends test

diff --git a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
index 6f8f583..8782ba9 100644
--- a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
+++ b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
@@ -17,7 +17,7 @@ function(run_BuildDepends CASE)
   if(run_BuildDepends_skip_step_2)
     return()
   endif()
-  execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 1) # handle 1s resolution
+  execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 1.125) # handle 1s resolution
   include(${RunCMake_SOURCE_DIR}/${CASE}.step2.cmake OPTIONAL)
   set(check_step 2)
   run_cmake_command(${CASE}-build2 ${CMAKE_COMMAND} --build . --config Debug)

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

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


hooks/post-receive
-- 
CMake