Commit 7fa657b4 authored by Brad King's avatar Brad King
Browse files

Merge branch 'autogen_windows_search_fix' into release-3.16

Merge-request: !3962
parents e5cc8f57 90d643c3
...@@ -1342,10 +1342,9 @@ bool cmQtAutoMocUicT::JobEvalCacheMocT::FindIncludedHeader( ...@@ -1342,10 +1342,9 @@ bool cmQtAutoMocUicT::JobEvalCacheMocT::FindIncludedHeader(
auto findHeader = [this, auto findHeader = [this,
&headerHandle](std::string const& basePath) -> bool { &headerHandle](std::string const& basePath) -> bool {
bool found = false; bool found = false;
std::string const baseCollapsed =
this->Gen()->CollapseFullPathTS(cmStrCat(basePath, '.'));
for (std::string const& ext : this->BaseConst().HeaderExtensions) { for (std::string const& ext : this->BaseConst().HeaderExtensions) {
std::string const testPath = cmStrCat(baseCollapsed, ext); std::string const testPath =
this->Gen()->CollapseFullPathTS(cmStrCat(basePath, '.', ext));
cmFileTime fileTime; cmFileTime fileTime;
if (!fileTime.Load(testPath)) { if (!fileTime.Load(testPath)) {
// File not found // File not found
...@@ -1377,8 +1376,7 @@ bool cmQtAutoMocUicT::JobEvalCacheMocT::FindIncludedHeader( ...@@ -1377,8 +1376,7 @@ bool cmQtAutoMocUicT::JobEvalCacheMocT::FindIncludedHeader(
} }
} }
if (!found) { if (!found) {
this->SearchLocations.emplace_back( this->SearchLocations.emplace_back(cmQtAutoGen::ParentDir(basePath));
cmQtAutoGen::ParentDir(baseCollapsed));
} }
return found; return found;
}; };
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment