diff options
| author | Brad King <brad.king@kitware.com> | 2015-06-08 18:17:58 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-06-08 18:17:58 (GMT) |
| commit | 40e1ed9f9d0aa6b4e33bbbf71eece5175e098c8d (patch) | |
| tree | 203248fc5634df5cfbe815ec137948fe5a0ff90c | |
| parent | c279078f14bf3cdcae945d234e33b9b4027173eb (diff) | |
| parent | 12436efc1483e8e0e5fd6ce616c0b8ed94af72a3 (diff) | |
| download | CMake-40e1ed9f9d0aa6b4e33bbbf71eece5175e098c8d.zip CMake-40e1ed9f9d0aa6b4e33bbbf71eece5175e098c8d.tar.gz CMake-40e1ed9f9d0aa6b4e33bbbf71eece5175e098c8d.tar.bz2 | |
Merge branch 'ctest-script-mode-no-legacy-cygwin' into release
| -rw-r--r-- | Source/CTest/cmCTestScriptHandler.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
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; |