summaryrefslogtreecommitdiffstats
path: root/Source/cmQtAutoMocUic.cxx
diff options
context:
space:
mode:
authorSebastian Holtermann <sebholt@xwmw.org>2019-09-12 11:15:32 (GMT)
committerSebastian Holtermann <sebholt@xwmw.org>2019-09-16 16:18:48 (GMT)
commitf54c5ee52195ae2d73a54faef9399ab977b83a1b (patch)
treea811c29072922dcaf4d8c7230706af35f5477023 /Source/cmQtAutoMocUic.cxx
parent65c49e0e26488931e6ec27a1d352c07d43171f22 (diff)
downloadCMake-f54c5ee52195ae2d73a54faef9399ab977b83a1b.zip
CMake-f54c5ee52195ae2d73a54faef9399ab977b83a1b.tar.gz
CMake-f54c5ee52195ae2d73a54faef9399ab977b83a1b.tar.bz2
Autogen: Use CollapseFullPath instead of RealPath to support symbolic links
Diffstat (limited to 'Source/cmQtAutoMocUic.cxx')
-rw-r--r--Source/cmQtAutoMocUic.cxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/cmQtAutoMocUic.cxx b/Source/cmQtAutoMocUic.cxx
index 40ebdde..3e30a2f 100644
--- a/Source/cmQtAutoMocUic.cxx
+++ b/Source/cmQtAutoMocUic.cxx
@@ -838,7 +838,8 @@ cmQtAutoMocUic::SourceFileHandleT cmQtAutoMocUic::JobEvaluateT::MocFindHeader(
cmFileTime fileTime;
if (fileTime.Load(testPath)) {
// Compute real path of the file
- testPath = cmSystemTools::GetRealPath(testPath);
+ testPath = cmSystemTools::CollapseFullPath(testPath,
+ BaseConst().CurrentSourceDir);
// Return a known file if it exists already
{
auto it = BaseEval().Headers.find(testPath);
@@ -1057,12 +1058,13 @@ cmQtAutoMocUic::JobEvaluateT::UicFindIncludedUi(
cmFileTime fileTime;
if (fileTime.Load(testFile)) {
// .ui file found in files system!
- std::string realPath = cmSystemTools::GetRealPath(testFile);
+ std::string fullPath = cmSystemTools::CollapseFullPath(
+ testFile, BaseConst().CurrentSourceDir);
// Get or create .ui file handle
- SourceFileHandleT& handle = Gen()->UicEval().UiFiles[realPath];
+ SourceFileHandleT& handle = Gen()->UicEval().UiFiles[fullPath];
if (!handle) {
// The file wasn't registered, yet
- handle = std::make_shared<SourceFileT>(realPath);
+ handle = std::make_shared<SourceFileT>(fullPath);
handle->FileTime = fileTime;
}
return handle;