summaryrefslogtreecommitdiffstats
path: root/Source/CTest
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-06-09 13:18:46 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-06-09 13:18:46 (GMT)
commit82986700d132a25f4ef8ad2756b767661af7fab8 (patch)
tree73754a9645fc5be2b9878c287dfbef682f491d8b /Source/CTest
parenta53d920290f15a55737c944f3abf563d8d5d002d (diff)
parent12436efc1483e8e0e5fd6ce616c0b8ed94af72a3 (diff)
downloadCMake-82986700d132a25f4ef8ad2756b767661af7fab8.zip
CMake-82986700d132a25f4ef8ad2756b767661af7fab8.tar.gz
CMake-82986700d132a25f4ef8ad2756b767661af7fab8.tar.bz2
Merge topic 'ctest-script-mode-no-legacy-cygwin'
12436efc ctest: Disable CMake Cygwin legacy warning in dashboard client script
Diffstat (limited to 'Source/CTest')
-rw-r--r--Source/CTest/cmCTestScriptHandler.cxx4
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;