diff options
| author | Brad King <brad.king@kitware.com> | 2018-03-26 11:48:15 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-03-26 11:48:15 (GMT) |
| commit | 188c5c2a46173b0bcff928098fb406ad925fb3db (patch) | |
| tree | 9316d81cb400fe459b4853fe5600b98b3740f41b /Source | |
| parent | 218471a35c59f134051058e0dc2e0947df0052b4 (diff) | |
| parent | 70c50aa23cc993a502cd3c87be8afb79d973b50e (diff) | |
| download | CMake-188c5c2a46173b0bcff928098fb406ad925fb3db.zip CMake-188c5c2a46173b0bcff928098fb406ad925fb3db.tar.gz CMake-188c5c2a46173b0bcff928098fb406ad925fb3db.tar.bz2 | |
Merge branch 'revert-CTestTestfile-removal-again' into release-3.11
Merge-request: !1887
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index cee540b..e942ff4 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -224,14 +224,7 @@ void cmLocalGenerator::TraceDependencies() void cmLocalGenerator::GenerateTestFiles() { - std::string file = this->StateSnapshot.GetDirectory().GetCurrentBinary(); - file += "/"; - file += "CTestTestfile.cmake"; - if (!this->Makefile->IsOn("CMAKE_TESTING_ENABLED")) { - if (cmSystemTools::FileExists(file)) { - cmSystemTools::RemoveFile(file); - } return; } @@ -240,6 +233,10 @@ void cmLocalGenerator::GenerateTestFiles() const std::string& config = this->Makefile->GetConfigurations(configurationTypes, false); + std::string file = this->StateSnapshot.GetDirectory().GetCurrentBinary(); + file += "/"; + file += "CTestTestfile.cmake"; + cmGeneratedFileStream fout(file.c_str()); fout.SetCopyIfDifferent(true); |