cmLocalGenerator::MayBeRelativeToWorkDir: take care of all cases

This commit is contained in:
Marc Chevrier
2023-04-29 17:07:52 +02:00
parent 2488d6dbf7
commit 24a3e5cda0
7 changed files with 32 additions and 31 deletions
+2 -13
View File
@@ -20,15 +20,8 @@ class cmSourceFile;
*/
class cmLocalCommonGenerator : public cmLocalGenerator
{
protected:
enum class WorkDir
{
TopBin,
CurBin,
};
public:
cmLocalCommonGenerator(cmGlobalGenerator* gg, cmMakefile* mf, WorkDir wd);
cmLocalCommonGenerator(cmGlobalGenerator* gg, cmMakefile* mf);
~cmLocalCommonGenerator() override;
std::vector<std::string> const& GetConfigNames() const
@@ -36,9 +29,7 @@ public:
return this->ConfigNames;
}
std::string const& GetWorkingDirectory() const;
std::string MaybeRelativeToWorkDir(std::string const& path) const;
virtual std::string const& GetWorkingDirectory() const;
std::string GetTargetFortranFlags(cmGeneratorTarget const* target,
std::string const& config) override;
@@ -48,8 +39,6 @@ public:
cmGeneratorTarget const* gt = nullptr) override;
protected:
WorkDir WorkingDirectory;
std::vector<std::string> ConfigNames;
friend class cmCommonTargetGenerator;