Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-19 19:43:23 +08:00
Code Issues Projects Releases Wiki Activity

cmDependsFortran: Simplify relative path conversion helper

Browse Source 
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.
This commit is contained in:
Brad King
2021-05-13 11:54:15 -04:00
parent ba7b939831
commit ec1ea13066
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmDependsFortran.cxx
View File

@@ -17,8 +17,6 @@
#include "cmMakefile.h" #include "cmMakefile.h"
#include "cmOutputConverter.h" #include "cmOutputConverter.h"
#include "cmProperty.h" #include "cmProperty.h"
#include "cmStateDirectory.h"
#include "cmStateSnapshot.h"
#include "cmStringAlgorithms.h" #include "cmStringAlgorithms.h"
#include "cmSystemTools.h" #include "cmSystemTools.h"
@@ -685,9 +683,5 @@ bool cmDependsFortran::ModulesDiffer(const std::string& modFile,
std::string cmDependsFortran::MaybeConvertToRelativePath( std::string cmDependsFortran::MaybeConvertToRelativePath(
std::string const& base, std::string const& path) std::string const& base, std::string const& path)
{ {
if (!this->LocalGenerator->GetStateSnapshot().GetDirectory().ContainsBoth( return this->LocalGenerator->MaybeConvertToRelativePath(base, path);
base, path)) {
return path;
}
return cmSystemTools::ForceToRelativePath(base, path);
} }