diff options
| author | Alex Neundorf <neundorf@kde.org> | 2012-10-14 19:16:25 (GMT) |
|---|---|---|
| committer | Alex Neundorf <neundorf@kde.org> | 2012-10-14 19:16:25 (GMT) |
| commit | 3446cb514bd2a4fd8538fd62ee9cf674268657d6 (patch) | |
| tree | 91c9e15eb3d5c79712693f8c889b7eb569a58f43 | |
| parent | cf7b1d9f714251fbf1d9ad9536977c6d2fc11a14 (diff) | |
| download | CMake-3446cb514bd2a4fd8538fd62ee9cf674268657d6.zip CMake-3446cb514bd2a4fd8538fd62ee9cf674268657d6.tar.gz CMake-3446cb514bd2a4fd8538fd62ee9cf674268657d6.tar.bz2 | |
Automoc: fix #13572: issue with symbolic links
Now automoc always uses GetRealPath() so symbolic links are always
resolved and it doesn't end up with twice the same file, once with the real
path and once with the symlinked path in some setups where the source dir
can be accessed directly and via a symlink
Alex
| -rw-r--r-- | Source/cmQtAutomoc.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx index 68f1046..942c7ab 100644 --- a/Source/cmQtAutomoc.cxx +++ b/Source/cmQtAutomoc.cxx @@ -170,7 +170,8 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target) ++fileIt) { cmSourceFile* sf = *fileIt; - std::string absFile = sf->GetFullPath(); + std::string absFile = cmsys::SystemTools::GetRealPath( + sf->GetFullPath().c_str()); bool skip = cmSystemTools::IsOn(sf->GetPropertyForUser("SKIP_AUTOMOC")); bool generated = cmSystemTools::IsOn(sf->GetPropertyForUser("GENERATED")); |