diff options
| author | Bruno Manganelli <bruno.manga95@gmail.com> | 2018-11-23 02:16:51 (GMT) |
|---|---|---|
| committer | Bruno Manganelli <bruno.manga95@gmail.com> | 2018-12-08 11:24:06 (GMT) |
| commit | 33f08eec18b440eac1f24f6f18b971c6203307bd (patch) | |
| tree | efb4e1304611ce92cd8b6312f4dffa1cad6d2045 /Source/cmLocalUnixMakefileGenerator3.cxx | |
| parent | 87e810f223bad6fb889e7ae4ad08be98461bf6e2 (diff) | |
| download | CMake-33f08eec18b440eac1f24f6f18b971c6203307bd.zip CMake-33f08eec18b440eac1f24f6f18b971c6203307bd.tar.gz CMake-33f08eec18b440eac1f24f6f18b971c6203307bd.tar.bz2 | |
cmOutputConverter: Moved ContainedInDirectory to cmStateDirectory
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator3.cxx')
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index ee38cfb..707a1b5 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -2093,8 +2093,7 @@ void cmLocalUnixMakefileGenerator3::CreateCDCommand( std::string cmLocalUnixMakefileGenerator3::MaybeConvertToRelativePath( std::string const& base, std::string const& path) { - if (!cmOutputConverter::ContainedInDirectory( - base, path, this->GetStateSnapshot().GetDirectory())) { + if (!this->GetStateSnapshot().GetDirectory().ContainsBoth(base, path)) { return path; } return cmSystemTools::ForceToRelativePath(base, path); |