diff options
| author | Brad King <brad.king@kitware.com> | 2019-06-07 15:14:11 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-06-07 15:14:20 (GMT) |
| commit | 8be4b173f1ed59cbc084eeedd6ef3706ea5ca10a (patch) | |
| tree | b8e4a2ce84f9ce68369f6af5e9833460f9bb7035 /Source | |
| parent | e2414ee13d1fad8b6775581d01975109c9867854 (diff) | |
| parent | 00e6b67e0c89ca25c5efd78f4a4b27fa53b64e77 (diff) | |
| download | CMake-8be4b173f1ed59cbc084eeedd6ef3706ea5ca10a.zip CMake-8be4b173f1ed59cbc084eeedd6ef3706ea5ca10a.tar.gz CMake-8be4b173f1ed59cbc084eeedd6ef3706ea5ca10a.tar.bz2 | |
Merge topic 'autogen_header_in_symbolic_path_fix'
00e6b67e0c Autogen: Fix header detection for paths with symbolic links
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3431
Diffstat (limited to 'Source')
| -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) { |