diff options
| author | Brad King <brad.king@kitware.com> | 2019-10-31 13:09:30 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-10-31 13:09:39 (GMT) |
| commit | 6f15cea15ef510274fb062742744f23550260d01 (patch) | |
| tree | aa43b03ac4e940918018c695df24ec45ecc42ed8 | |
| parent | 9a72065fa9de6f9bdf25bbf46137c7c6b4e8196e (diff) | |
| parent | 90d643c31221a1b1e3841a0a1f7a2b2f8d16d2d8 (diff) | |
| download | CMake-6f15cea15ef510274fb062742744f23550260d01.zip CMake-6f15cea15ef510274fb062742744f23550260d01.tar.gz CMake-6f15cea15ef510274fb062742744f23550260d01.tar.bz2 | |
Merge topic 'autogen_windows_search_fix'
90d643c312 Autogen: Fix ambiguity in header file detection on Windows
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3962
| -rw-r--r-- | Source/cmQtAutoMocUic.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Source/cmQtAutoMocUic.cxx b/Source/cmQtAutoMocUic.cxx index 127421a..f8b8981 100644 --- a/Source/cmQtAutoMocUic.cxx +++ b/Source/cmQtAutoMocUic.cxx @@ -1342,10 +1342,9 @@ bool cmQtAutoMocUicT::JobEvalCacheMocT::FindIncludedHeader( auto findHeader = [this, &headerHandle](std::string const& basePath) -> bool { bool found = false; - std::string const baseCollapsed = - this->Gen()->CollapseFullPathTS(cmStrCat(basePath, '.')); 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; if (!fileTime.Load(testPath)) { // File not found @@ -1377,8 +1376,7 @@ bool cmQtAutoMocUicT::JobEvalCacheMocT::FindIncludedHeader( } } if (!found) { - this->SearchLocations.emplace_back( - cmQtAutoGen::ParentDir(baseCollapsed)); + this->SearchLocations.emplace_back(cmQtAutoGen::ParentDir(basePath)); } return found; }; |