cmLocalCommonGenerator: Factor out relative path conversion helper
This commit is contained in:
parent
1d1d88d3c8
commit
1879f1bcbc
@ -241,8 +241,7 @@ std::string cmCommonTargetGenerator::GetManifests(const std::string& config)
|
||||
manifests.reserve(manifest_srcs.size());
|
||||
for (cmSourceFile const* manifest_src : manifest_srcs) {
|
||||
manifests.push_back(this->LocalCommonGenerator->ConvertToOutputFormat(
|
||||
this->LocalCommonGenerator->MaybeConvertToRelativePath(
|
||||
this->LocalCommonGenerator->GetWorkingDirectory(),
|
||||
this->LocalCommonGenerator->MaybeRelativeToWorkDir(
|
||||
manifest_src->GetFullPath()),
|
||||
cmOutputConverter::SHELL));
|
||||
}
|
||||
|
@ -24,6 +24,12 @@ cmLocalCommonGenerator::cmLocalCommonGenerator(cmGlobalGenerator* gg,
|
||||
|
||||
cmLocalCommonGenerator::~cmLocalCommonGenerator() = default;
|
||||
|
||||
std::string cmLocalCommonGenerator::MaybeRelativeToWorkDir(
|
||||
std::string const& path) const
|
||||
{
|
||||
return this->MaybeConvertToRelativePath(this->WorkingDirectory, path);
|
||||
}
|
||||
|
||||
std::string cmLocalCommonGenerator::GetTargetFortranFlags(
|
||||
cmGeneratorTarget const* target, std::string const& config)
|
||||
{
|
||||
@ -38,8 +44,7 @@ std::string cmLocalCommonGenerator::GetTargetFortranFlags(
|
||||
target->GetFortranModuleDirectory(this->WorkingDirectory);
|
||||
if (!mod_dir.empty()) {
|
||||
mod_dir = this->ConvertToOutputFormat(
|
||||
this->MaybeConvertToRelativePath(this->WorkingDirectory, mod_dir),
|
||||
cmOutputConverter::SHELL);
|
||||
this->MaybeRelativeToWorkDir(mod_dir), cmOutputConverter::SHELL);
|
||||
} else {
|
||||
mod_dir =
|
||||
this->Makefile->GetSafeDefinition("CMAKE_Fortran_MODDIR_DEFAULT");
|
||||
|
@ -32,6 +32,8 @@ public:
|
||||
|
||||
std::string GetWorkingDirectory() const { return this->WorkingDirectory; }
|
||||
|
||||
std::string MaybeRelativeToWorkDir(std::string const& path) const;
|
||||
|
||||
std::string GetTargetFortranFlags(cmGeneratorTarget const* target,
|
||||
std::string const& config) override;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user