summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalUnixMakefileGenerator3.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-01-29 14:17:13 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-01-29 14:18:42 (GMT)
commit60c06620a690f0cbeeaa3fba762e19cd031669ca (patch)
treec72e5f4bd45dc2a769e0c7f7bcbbfbd108f0e0f7 /Source/cmLocalUnixMakefileGenerator3.cxx
parent90ac5e6384735deb0ac523684010b2f4701d4f4d (diff)
parentb6a957c9696706a338cdeef63540bf8a4c42d22d (diff)
downloadCMake-60c06620a690f0cbeeaa3fba762e19cd031669ca.zip
CMake-60c06620a690f0cbeeaa3fba762e19cd031669ca.tar.gz
CMake-60c06620a690f0cbeeaa3fba762e19cd031669ca.tar.bz2
Merge topic 'cmoutputconverter-simplify'
b6a957c969 cmOutputConverter: move ConvertToRelativePath to cmStateDirectory. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2831
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator3.cxx')
-rw-r--r--Source/cmLocalUnixMakefileGenerator3.cxx9
1 files changed, 0 insertions, 9 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 173ac7a..55ce50b 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -2079,12 +2079,3 @@ void cmLocalUnixMakefileGenerator3::CreateCDCommand(
[&prefix](std::string const& s) { return prefix + s; });
}
}
-
-std::string cmLocalUnixMakefileGenerator3::MaybeConvertToRelativePath(
- std::string const& base, std::string const& path)
-{
- if (!this->GetStateSnapshot().GetDirectory().ContainsBoth(base, path)) {
- return path;
- }
- return cmSystemTools::ForceToRelativePath(base, path);
-}