mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-23 14:48:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'automoc-rerun-missing-dependency'

Browse Source 
9ac3503d30 AutoMoc: Re-run moc if a dependency is missing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5180
This commit is contained in:
Brad King
2020-09-10 13:45:47 +00:00
committed by Kitware Robot
parent 67355ac5de 9ac3503d30
commit 8fe4d18e1a
9 changed files with 132 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmQtAutoMocUic.cxx
+15 -7
View File
@@ -192,7 +192,7 @@ public:
{
public:
// -- Parse Cache
bool ParseCacheChanged = false;
std::atomic<bool> ParseCacheChanged = ATOMIC_VAR_INIT(false);
cmFileTime ParseCacheTime;
ParseCacheT ParseCache;
@@ -1777,16 +1777,24 @@ bool cmQtAutoMocUicT::JobProbeDepsMocT::Probe(MappingT const& mapping,
{
// Check dependency timestamps
std::string const sourceDir = SubDirPrefix(sourceFile);
for (std::string const& dep : mapping.SourceFile->ParseData->Moc.Depends) {
auto& dependencies = mapping.SourceFile->ParseData->Moc.Depends;
for (auto it = dependencies.begin(); it != dependencies.end(); ++it) {
auto& dep = *it;
// Find dependency file
auto const depMatch = FindDependency(sourceDir, dep);
if (depMatch.first.empty()) {
Log().Warning(GenT::MOC,
cmStrCat(MessagePath(sourceFile), " depends on ",
MessagePath(dep),
" but the file does not exist."));
continue;
if (reason != nullptr) {
*reason =
cmStrCat("Generating ", MessagePath(outputFile), " from ",
MessagePath(sourceFile), ", because its dependency ",
MessagePath(dep), " vanished.");
}
dependencies.erase(it);
BaseEval().ParseCacheChanged = true;
return true;
}
// Test if dependency file is older
if (outputFileTime.Older(depMatch.second)) {
if (reason != nullptr) {