summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefileTargetGenerator.cxx
diff options
context:
space:
mode:
authorBruno Manganelli <bruno.manga95@gmail.com>2018-11-23 02:16:51 (GMT)
committerBruno Manganelli <bruno.manga95@gmail.com>2018-12-08 11:24:06 (GMT)
commit33f08eec18b440eac1f24f6f18b971c6203307bd (patch)
treeefb4e1304611ce92cd8b6312f4dffa1cad6d2045 /Source/cmMakefileTargetGenerator.cxx
parent87e810f223bad6fb889e7ae4ad08be98461bf6e2 (diff)
downloadCMake-33f08eec18b440eac1f24f6f18b971c6203307bd.zip
CMake-33f08eec18b440eac1f24f6f18b971c6203307bd.tar.gz
CMake-33f08eec18b440eac1f24f6f18b971c6203307bd.tar.bz2
cmOutputConverter: Moved ContainedInDirectory to cmStateDirectory
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
-rw-r--r--Source/cmMakefileTargetGenerator.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index e6f9830..cb41c28 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -1308,8 +1308,7 @@ public:
private:
std::string MaybeConvertToRelativePath(std::string const& obj)
{
- if (!cmOutputConverter::ContainedInDirectory(
- this->StateDir.GetCurrentBinary(), obj, this->StateDir)) {
+ if (!this->StateDir.ContainsBoth(this->StateDir.GetCurrentBinary(), obj)) {
return obj;
}
return cmSystemTools::ForceToRelativePath(