mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-12-30 18:29:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

GHS: Fix RERUN_CMAKE issue when generation step fails

Browse Source 
Fixes: 23435
This commit is contained in:
Fred Baksik
2022-04-16 07:41:43 -04:00
parent c279845ee7
commit 1de3382de5
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Source/cmGlobalGhsMultiGenerator.cxx
View File

@@ -425,13 +425,6 @@ void cmGlobalGhsMultiGenerator::Generate()
this->WriteFileHeader(ftarget);
this->WriteCustomTargetBOD(ftarget);
ftarget.Close();
// create the stamp file when running CMake
if (!this->StampFile.empty()) {
cmGeneratedFileStream fstamp(this->StampFile);
fstamp.SetCopyIfDifferent(false);
fstamp.Close();
}
}
void cmGlobalGhsMultiGenerator::OutputTopLevelProject(
@@ -695,10 +688,16 @@ bool cmGlobalGhsMultiGenerator::AddCheckTarget()
listFiles.erase(newEnd, listFiles.end());
// Create a rule to re-run CMake and create output file.
cmCustomCommandLines commandLines;
commandLines.emplace_back(
cmMakeCommandLine({ cmSystemTools::GetCMakeCommand(), "-E", "rm", "-f",
this->StampFile }));
std::string argS = cmStrCat("-S", lg.GetSourceDirectory());
std::string argB = cmStrCat("-B", lg.GetBinaryDirectory());
cmCustomCommandLines commandLines = cmMakeSingleCommandLine(
{ cmSystemTools::GetCMakeCommand(), argS, argB });
commandLines.emplace_back(
cmMakeCommandLine({ cmSystemTools::GetCMakeCommand(), argS, argB }));
commandLines.emplace_back(cmMakeCommandLine(
{ cmSystemTools::GetCMakeCommand(), "-E", "touch", this->StampFile }));
/* Create the target(Exclude from ALL_BUILD).
*