mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-28 11:48:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'autogen_header_in_symbolic_path_fix' into release-3.15

Browse Source 
Merge-request: !3431
This commit is contained in:
Brad King
2019-06-07 11:16:04 -04:00
parent 1f466935da 00e6b67e0c
commit 43316424d0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmQtAutoGenInitializer.cxx
View File

@@ -721,9 +721,9 @@ bool cmQtAutoGenInitializer::InitScanFiles()
MUFile const& muf = *pair.second;
if (muf.MocIt || muf.UicIt) {
// Search for the default header file and a private header
std::string const& realPath = muf.RealPath;
std::string basePath = cmQtAutoGen::SubDirPrefix(realPath);
basePath += cmSystemTools::GetFilenameWithoutLastExtension(realPath);
std::string const& srcPath = muf.SF->GetFullPath();
std::string basePath = cmQtAutoGen::SubDirPrefix(srcPath);
basePath += cmSystemTools::GetFilenameWithoutLastExtension(srcPath);
for (auto const& suffix : suffixes) {
std::string const suffixedPath = basePath + suffix;
for (auto const& ext : exts) {