[Cmake-commits] CMake branch, next, updated. v3.3.0-rc1-244-g06d2158

[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  06d21584b51c2de5d520e3d201053a2a7d0af5be (commit)
       via  12436efc1483e8e0e5fd6ce616c0b8ed94af72a3 (commit)
      from  ef14e90a3fad93cc61c05560c364b8e22b9cbc92 (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=06d21584b51c2de5d520e3d201053a2a7d0af5be
commit 06d21584b51c2de5d520e3d201053a2a7d0af5be
Merge: ef14e90 12436ef
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 8 14:16:47 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 8 14:16:47 2015 -0400

    Merge topic 'ctest-script-mode-no-legacy-cygwin' into next
    
    12436efc ctest: Disable CMake Cygwin legacy warning in dashboard client script


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=12436efc1483e8e0e5fd6ce616c0b8ed94af72a3
commit 12436efc1483e8e0e5fd6ce616c0b8ed94af72a3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 8 14:13:47 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jun 8 14:16:28 2015 -0400

    ctest: Disable CMake Cygwin legacy warning in dashboard client script
    
    In ctest -S mode we load the CTestScriptMode module to give the
    configuration scripts access to the host system information.
    CYGWIN.cmake warns unless we explicitly tell it not to warn
    since there is no chance for a cmake_minimum_required(VERSION)
    to be called.

diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx
index 1e493b0..047bd98 100644
--- a/Source/CTest/cmCTestScriptHandler.cxx
+++ b/Source/CTest/cmCTestScriptHandler.cxx
@@ -421,6 +421,10 @@ int cmCTestScriptHandler::ReadInScript(const std::string& total_script_arg)
     this->Makefile->AddDefinition("CTEST_SCRIPT_ARG", script_arg.c_str());
     }
 
+#if defined(__CYGWIN__)
+  this->Makefile->AddDefinition("CMAKE_LEGACY_CYGWIN_WIN32", "0");
+#endif
+
   // always add a function blocker to update the elapsed time
   cmCTestScriptFunctionBlocker *f = new cmCTestScriptFunctionBlocker();
   f->CTestScriptHandler = this;

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

Summary of changes:
 Source/CTest/cmCTestScriptHandler.cxx |    4 ++++
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
CMake