From 1de3382de5f183726c65415cd1e31a4e1812bc92 Mon Sep 17 00:00:00 2001 From: Fred Baksik Date: Sat, 16 Apr 2022 07:41:43 -0400 Subject: GHS: Fix RERUN_CMAKE issue when generation step fails Fixes: 23435 --- Source/cmGlobalGhsMultiGenerator.cxx | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx index f405a04..9c334a5 100644 --- a/Source/cmGlobalGhsMultiGenerator.cxx +++ b/Source/cmGlobalGhsMultiGenerator.cxx @@ -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). * -- cgit v0.12