mirror of
https://github.com/Kitware/CMake.git
synced 2025-10-19 19:43:23 +08:00
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.
This commit is contained in:
@@ -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);
|
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user