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

cmLocalCommonGenerator: Factor out relative path conversion helper

Browse Source
This commit is contained in:
Brad King
2021-05-12 15:34:38 -04:00
parent 1d1d88d3c8
commit 1879f1bcbc
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/cmCommonTargetGenerator.cxx
View File

@@ -241,8 +241,7 @@ std::string cmCommonTargetGenerator::GetManifests(const std::string& config)
manifests.reserve(manifest_srcs.size()); manifests.reserve(manifest_srcs.size());
for (cmSourceFile const* manifest_src : manifest_srcs) { for (cmSourceFile const* manifest_src : manifest_srcs) {
manifests.push_back(this->LocalCommonGenerator->ConvertToOutputFormat( manifests.push_back(this->LocalCommonGenerator->ConvertToOutputFormat(
this->LocalCommonGenerator->MaybeConvertToRelativePath( this->LocalCommonGenerator->MaybeRelativeToWorkDir(
this->LocalCommonGenerator->GetWorkingDirectory(),
manifest_src->GetFullPath()), manifest_src->GetFullPath()),
cmOutputConverter::SHELL)); cmOutputConverter::SHELL));
} }

9
Source/cmLocalCommonGenerator.cxx
View File

@@ -24,6 +24,12 @@ cmLocalCommonGenerator::cmLocalCommonGenerator(cmGlobalGenerator* gg,
cmLocalCommonGenerator::~cmLocalCommonGenerator() = default; cmLocalCommonGenerator::~cmLocalCommonGenerator() = default;
std::string cmLocalCommonGenerator::MaybeRelativeToWorkDir(
std::string const& path) const
{
return this->MaybeConvertToRelativePath(this->WorkingDirectory, path);
}
std::string cmLocalCommonGenerator::GetTargetFortranFlags( std::string cmLocalCommonGenerator::GetTargetFortranFlags(
cmGeneratorTarget const* target, std::string const& config) cmGeneratorTarget const* target, std::string const& config)
{ {
@@ -38,8 +44,7 @@ std::string cmLocalCommonGenerator::GetTargetFortranFlags(
target->GetFortranModuleDirectory(this->WorkingDirectory); target->GetFortranModuleDirectory(this->WorkingDirectory);
if (!mod_dir.empty()) { if (!mod_dir.empty()) {
mod_dir = this->ConvertToOutputFormat( mod_dir = this->ConvertToOutputFormat(
this->MaybeConvertToRelativePath(this->WorkingDirectory, mod_dir), this->MaybeRelativeToWorkDir(mod_dir), cmOutputConverter::SHELL);
cmOutputConverter::SHELL);
} else { } else {
mod_dir = mod_dir =
this->Makefile->GetSafeDefinition("CMAKE_Fortran_MODDIR_DEFAULT"); this->Makefile->GetSafeDefinition("CMAKE_Fortran_MODDIR_DEFAULT");

2
Source/cmLocalCommonGenerator.h
View File

@@ -32,6 +32,8 @@ public:
std::string GetWorkingDirectory() const { return this->WorkingDirectory; } std::string GetWorkingDirectory() const { return this->WorkingDirectory; }
std::string MaybeRelativeToWorkDir(std::string const& path) const;
std::string GetTargetFortranFlags(cmGeneratorTarget const* target, std::string GetTargetFortranFlags(cmGeneratorTarget const* target,
std::string const& config) override; std::string const& config) override;