Merge topic 'Empty_CTestTestfile_on_BUILD_TESTING_OFF'

ae4cfa8b Remove CTestTestfile.cmake when BUILD_TESTING is OFF
This commit is contained in:
Brad King
2016-11-16 07:47:02 -05:00
committed by CMake Topic Stage
+7 -4
View File
@@ -211,7 +211,14 @@ 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;
}
@@ -220,10 +227,6 @@ 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);