diff options
| author | Brad King <brad.king@kitware.com> | 2019-06-07 15:16:04 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-06-07 15:16:04 (GMT) |
| commit | 43316424d0f33d6dc12ae5d1d4528603e8f0fab9 (patch) | |
| tree | 8d252a4ba1947f3c48d58028dcb48ded8457c7b6 | |
| parent | 1f466935da2b04862307d126da0cf4d6b604d613 (diff) | |
| parent | 00e6b67e0c89ca25c5efd78f4a4b27fa53b64e77 (diff) | |
| download | CMake-43316424d0f33d6dc12ae5d1d4528603e8f0fab9.zip CMake-43316424d0f33d6dc12ae5d1d4528603e8f0fab9.tar.gz CMake-43316424d0f33d6dc12ae5d1d4528603e8f0fab9.tar.bz2 | |
Merge branch 'autogen_header_in_symbolic_path_fix' into release-3.15
Merge-request: !3431
| -rw-r--r-- | Source/cmQtAutoGenInitializer.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmQtAutoGenInitializer.cxx b/Source/cmQtAutoGenInitializer.cxx index 265daf6..9985f93 100644 --- a/Source/cmQtAutoGenInitializer.cxx +++ b/Source/cmQtAutoGenInitializer.cxx @@ -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) { |