diff options
| author | Brad King <brad.king@kitware.com> | 2021-05-13 15:54:15 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-05-13 16:46:26 (GMT) |
| commit | ec1ea13066e1b65bfd56ae62bda036f13c950c2d (patch) | |
| tree | ae9db443708fa897fb81c7b56a6d67aa5f811060 /Source/cmDependsFortran.cxx | |
| parent | ba7b939831428e51042ba98ea54df8b98a20ab27 (diff) | |
| download | CMake-ec1ea13066e1b65bfd56ae62bda036f13c950c2d.zip CMake-ec1ea13066e1b65bfd56ae62bda036f13c950c2d.tar.gz CMake-ec1ea13066e1b65bfd56ae62bda036f13c950c2d.tar.bz2 | |
cmDependsFortran: Simplify relative path conversion helper
Revert commit 8377d9e00b (Fortran: Inline conversion to relative path,
2016-10-04, v3.8.0-rc1~494^2~4). The inline implementation is still
identical to what was previously called. Restore the call again.
Diffstat (limited to 'Source/cmDependsFortran.cxx')
| -rw-r--r-- | Source/cmDependsFortran.cxx | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Source/cmDependsFortran.cxx b/Source/cmDependsFortran.cxx index 1a06f31..636b5e4 100644 --- a/Source/cmDependsFortran.cxx +++ b/Source/cmDependsFortran.cxx @@ -17,8 +17,6 @@ #include "cmMakefile.h" #include "cmOutputConverter.h" #include "cmProperty.h" -#include "cmStateDirectory.h" -#include "cmStateSnapshot.h" #include "cmStringAlgorithms.h" #include "cmSystemTools.h" @@ -685,9 +683,5 @@ bool cmDependsFortran::ModulesDiffer(const std::string& modFile, std::string cmDependsFortran::MaybeConvertToRelativePath( std::string const& base, std::string const& path) { - if (!this->LocalGenerator->GetStateSnapshot().GetDirectory().ContainsBoth( - base, path)) { - return path; - } - return cmSystemTools::ForceToRelativePath(base, path); + return this->LocalGenerator->MaybeConvertToRelativePath(base, path); } |