summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2012-10-17 20:44:14 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2012-10-17 20:44:14 (GMT)
commitf7db7d735d02518e60d6d2261b55d7a50ffa533d (patch)
tree69ec9c12f952ef4ffddbf210a52970efdc28e9ae
parent7ff422fb8e47c68ce9c23430059d307738d78f7a (diff)
parent3446cb514bd2a4fd8538fd62ee9cf674268657d6 (diff)
downloadCMake-f7db7d735d02518e60d6d2261b55d7a50ffa533d.zip
CMake-f7db7d735d02518e60d6d2261b55d7a50ffa533d.tar.gz
CMake-f7db7d735d02518e60d6d2261b55d7a50ffa533d.tar.bz2
Merge topic 'AutomocFixDuplicatedFiles_13572'
3446cb5 Automoc: fix #13572: issue with symbolic links
-rw-r--r--Source/cmQtAutomoc.cxx3
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"));