summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorOrkun Tokdemir <ilhanorkuntokdemir@gmail.com>2024-12-02 11:42:26 (GMT)
committerOrkun Tokdemir <ilhanorkuntokdemir@gmail.com>2024-12-04 11:37:13 (GMT)
commitdebc4d39069faecba2cf8c6263bb7d974c3bf34b (patch)
tree4b764acce40d2b7de928d333e50661424c63d9de /Source
parent27647acc6ca9c7e207478ec548ec7e12c4fbef8c (diff)
downloadCMake-debc4d39069faecba2cf8c6263bb7d974c3bf34b.zip
CMake-debc4d39069faecba2cf8c6263bb7d974c3bf34b.tar.gz
CMake-debc4d39069faecba2cf8c6263bb7d974c3bf34b.tar.bz2
Autogen: Revert adding ui files to byproducts of the timestamp target
When `ui_` include directives have different paths than `CMakeLists.txt`, the dependency graph is not generated correctly. This is the root cause of #16776. However, when #26135 was fixed by commit 5363bebc1e (Autogen: Fix compilation of unchanged source files, 2024-07-16, v3.31.0-rc1~328^2), it made #16776 worse: the build is always dirty. Revert the fix for now. Fixes: #26485 Issue: #26135 Issue: #25436
Diffstat (limited to 'Source')
-rw-r--r--Source/cmQtAutoGenInitializer.cxx22
1 files changed, 3 insertions, 19 deletions
diff --git a/Source/cmQtAutoGenInitializer.cxx b/Source/cmQtAutoGenInitializer.cxx
index b75a574..c9dd154 100644
--- a/Source/cmQtAutoGenInitializer.cxx
+++ b/Source/cmQtAutoGenInitializer.cxx
@@ -1340,25 +1340,9 @@ bool cmQtAutoGenInitializer::InitAutogenTarget()
}
if (this->Uic.Enabled) {
- auto const useAdvancedUicGraph = [this]() -> bool {
- if (this->MultiConfig && this->GlobalGen->IsNinja()) {
- return this->UseBetterGraph;
- }
- return true;
- }();
- if (useAdvancedUicGraph) {
- // Make all ui_*.h files byproducts of the ${target}_autogen/timestamp
- // custom command if the generation of depfile is enabled.
- auto& byProducts = useDepfile ? timestampByproducts : autogenByproducts;
- for (auto const& file : this->Uic.UiHeaders) {
- this->AddGeneratedSource(file.first, this->Uic);
- byProducts.push_back(file.second);
- }
- } else {
- for (auto const& file : this->Uic.UiHeaders) {
- this->AddGeneratedSource(file.first, this->Uic);
- autogenByproducts.push_back(file.second);
- }
+ for (auto const& file : this->Uic.UiHeaders) {
+ this->AddGeneratedSource(file.first, this->Uic);
+ autogenByproducts.push_back(file.second);
}
}