summaryrefslogtreecommitdiff
path: root/Source/cmQtAutoGenerator.cxx
diff options
context:
space:
mode:
authorSebastian Holtermann <sebholt@xwmw.org>2018-04-03 11:28:40 +0200
committerSebastian Holtermann <sebholt@xwmw.org>2018-04-03 17:20:29 +0200
commit14a86c9ea7efae1b3acb01bc79f2f1f5ef23c5f1 (patch)
tree917b96ff693ca0b72e932f0f4bc11e70078d8bfe /Source/cmQtAutoGenerator.cxx
parent61fd4c742013a7f9139db190f936703b656540ff (diff)
downloadcmake-14a86c9ea7efae1b3acb01bc79f2f1f5ef23c5f1.tar.gz
Autogen: Protected calls to cmSystemTools::CollapseCombinedPath
Diffstat (limited to 'Source/cmQtAutoGenerator.cxx')
-rw-r--r--Source/cmQtAutoGenerator.cxx9
1 files changed, 8 insertions, 1 deletions
diff --git a/Source/cmQtAutoGenerator.cxx b/Source/cmQtAutoGenerator.cxx
index 1939bd4e66..7f133ab661 100644
--- a/Source/cmQtAutoGenerator.cxx
+++ b/Source/cmQtAutoGenerator.cxx
@@ -146,13 +146,20 @@ void cmQtAutoGenerator::Logger::ErrorCommand(
}
}
-std::string cmQtAutoGenerator::FileSystem::RealPath(
+std::string cmQtAutoGenerator::FileSystem::GetRealPath(
std::string const& filename)
{
std::lock_guard<std::mutex> lock(Mutex_);
return cmSystemTools::GetRealPath(filename);
}
+std::string cmQtAutoGenerator::FileSystem::CollapseCombinedPath(
+ std::string const& dir, std::string const& file)
+{
+ std::lock_guard<std::mutex> lock(Mutex_);
+ return cmSystemTools::CollapseCombinedPath(dir, file);
+}
+
bool cmQtAutoGenerator::FileSystem::FileExists(std::string const& filename)
{
std::lock_guard<std::mutex> lock(Mutex_);