summaryrefslogtreecommitdiffstats
path: root/Source/cmQtAutoGenInitializer.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'Source/cmQtAutoGenInitializer.cxx')
-rw-r--r--Source/cmQtAutoGenInitializer.cxx44
1 files changed, 7 insertions, 37 deletions
diff --git a/Source/cmQtAutoGenInitializer.cxx b/Source/cmQtAutoGenInitializer.cxx
index d646cce..c95be77 100644
--- a/Source/cmQtAutoGenInitializer.cxx
+++ b/Source/cmQtAutoGenInitializer.cxx
@@ -1673,43 +1673,13 @@ bool cmQtAutoGenInitializer::InitRccTargets()
if (!qrc.Unique) {
ccName += cmStrCat('_', qrc.QrcPathChecksum);
}
- cmTarget* autoRccTarget = nullptr;
- // When CMAKE_GLOBAL_AUTORCC_TARGET is ON and qrc is not generated,
- // Add generate a timestamp file and a custom command to touch it.
- // This will ensure that the global autorcc target is run only when the
- // qrc file changes.
- if (!qrc.Generated && this->Rcc.GlobalTarget) {
- cm::string_view const timestampFileName = "global_rcc_timestamp";
- auto const outputFile =
- cmStrCat(this->Dir.Build, "/", timestampFileName);
- commandLines.push_back(cmMakeCommandLine(
- { cmSystemTools::GetCMakeCommand(), "-E", "touch", outputFile }));
- cc->SetByproducts(ccOutput);
- cc->SetDepends(ccDepends);
- cc->SetEscapeOldStyle(false);
- cc->SetOutputs(outputFile);
- cc->SetCommandLines(commandLines);
- this->LocalGen->AddCustomCommandToOutput(std::move(cc));
- this->AddGeneratedSource(outputFile, this->Rcc);
- ccDepends.clear();
- ccDepends.push_back(outputFile);
-
- auto ccRccTarget = cm::make_unique<cmCustomCommand>();
- ccRccTarget->SetWorkingDirectory(this->Dir.Work.c_str());
- ccRccTarget->SetComment(ccComment.c_str());
- ccRccTarget->SetStdPipesUTF8(true);
- ccRccTarget->SetDepends(ccDepends);
- ccRccTarget->SetEscapeOldStyle(false);
-
- autoRccTarget = this->LocalGen->AddUtilityCommand(
- ccName, true, std::move(ccRccTarget));
- } else {
- cc->SetByproducts(ccOutput);
- cc->SetDepends(ccDepends);
- cc->SetEscapeOldStyle(false);
- autoRccTarget =
- this->LocalGen->AddUtilityCommand(ccName, true, std::move(cc));
- }
+
+ cc->SetByproducts(ccOutput);
+ cc->SetDepends(ccDepends);
+ cc->SetEscapeOldStyle(false);
+ cmTarget* autoRccTarget =
+ this->LocalGen->AddUtilityCommand(ccName, true, std::move(cc));
+
// Create autogen generator target
this->LocalGen->AddGeneratorTarget(
cm::make_unique<cmGeneratorTarget>(autoRccTarget, this->LocalGen));