diff options
Diffstat (limited to 'Source/cmLocalCommonGenerator.cxx')
| -rw-r--r-- | Source/cmLocalCommonGenerator.cxx | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/Source/cmLocalCommonGenerator.cxx b/Source/cmLocalCommonGenerator.cxx index eca7a9eb6e..aa953f469d 100644 --- a/Source/cmLocalCommonGenerator.cxx +++ b/Source/cmLocalCommonGenerator.cxx @@ -8,7 +8,6 @@ #include "cmGeneratorTarget.h" #include "cmMakefile.h" #include "cmOutputConverter.h" -#include "cmState.h" #include "cmStateDirectory.h" #include "cmStateSnapshot.h" #include "cmStringAlgorithms.h" @@ -17,9 +16,8 @@ class cmGlobalGenerator; cmLocalCommonGenerator::cmLocalCommonGenerator(cmGlobalGenerator* gg, - cmMakefile* mf, WorkDir wd) + cmMakefile* mf) : cmLocalGenerator(gg, mf) - , WorkingDirectory(wd) { this->ConfigNames = this->Makefile->GetGeneratorConfigs(cmMakefile::IncludeEmptyConfig); @@ -29,21 +27,9 @@ cmLocalCommonGenerator::~cmLocalCommonGenerator() = default; std::string const& cmLocalCommonGenerator::GetWorkingDirectory() const { - if (this->WorkingDirectory == WorkDir::TopBin) { - return this->GetState()->GetBinaryDirectory(); - } return this->StateSnapshot.GetDirectory().GetCurrentBinary(); } -std::string cmLocalCommonGenerator::MaybeRelativeToWorkDir( - std::string const& path) const -{ - if (this->WorkingDirectory == WorkDir::TopBin) { - return this->MaybeRelativeToTopBinDir(path); - } - return this->MaybeRelativeToCurBinDir(path); -} - std::string cmLocalCommonGenerator::GetTargetFortranFlags( cmGeneratorTarget const* target, std::string const& config) { |