diff options
| author | Brad King <brad.king@kitware.com> | 2020-08-25 17:58:21 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-08-25 17:58:28 (GMT) |
| commit | 4767548733ad3ef354c2312b2bda628a6f80bb59 (patch) | |
| tree | 6cbc5a1971d9343b063d4335f45e9f81df68b06b | |
| parent | d2c3dea64be9ea364a26f4f0e0b3ae1c085b260a (diff) | |
| parent | a48bb185c31ee17d9d8bb9f33ce7a00dd01f4fb5 (diff) | |
| download | CMake-4767548733ad3ef354c2312b2bda628a6f80bb59.zip CMake-4767548733ad3ef354c2312b2bda628a6f80bb59.tar.gz CMake-4767548733ad3ef354c2312b2bda628a6f80bb59.tar.bz2 | |
Merge topic 'automoc_timestamp_nmc_fix' into release-3.18
a48bb185c3 AutoGen: Fix moc and uic dependencies when building Qt itself
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5153
| -rw-r--r-- | Source/cmQtAutoGenInitializer.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmQtAutoGenInitializer.cxx b/Source/cmQtAutoGenInitializer.cxx index 1132852..79927b9 100644 --- a/Source/cmQtAutoGenInitializer.cxx +++ b/Source/cmQtAutoGenInitializer.cxx @@ -1224,9 +1224,13 @@ bool cmQtAutoGenInitializer::InitAutogenTarget() if (this->Moc.ExecutableTarget != nullptr) { dependencies.push_back(this->Moc.ExecutableTarget->Target->GetName()); + } else if (!this->Moc.Executable.empty()) { + dependencies.push_back(this->Moc.Executable); } if (this->Uic.ExecutableTarget != nullptr) { dependencies.push_back(this->Uic.ExecutableTarget->Target->GetName()); + } else if (!this->Uic.Executable.empty()) { + dependencies.push_back(this->Uic.Executable); } // Create the custom command that outputs the timestamp file. |