From 73245e591109c38712d5aa91bee655de70e8456a Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sat, 23 May 2015 14:35:22 +0200 Subject: [PATCH] GHS: Remove unnecessary Configure override. This only sets a member variable which is never read. Presumably this was copied from the makefile generator. --- Source/cmLocalGhsMultiGenerator.cxx | 18 ------------------ Source/cmLocalGhsMultiGenerator.h | 10 ---------- 2 files changed, 28 deletions(-) diff --git a/Source/cmLocalGhsMultiGenerator.cxx b/Source/cmLocalGhsMultiGenerator.cxx index ddef3f521..a537265b2 100644 --- a/Source/cmLocalGhsMultiGenerator.cxx +++ b/Source/cmLocalGhsMultiGenerator.cxx @@ -37,21 +37,3 @@ void cmLocalGhsMultiGenerator::Generate() } } } - -// Implemented in: -// cmLocalGenerator. -// Used in: -// Source/cmMakefile.cxx -// Source/cmGlobalGenerator.cxx -void cmLocalGhsMultiGenerator::Configure() -{ - // Compute the path to use when referencing the current output - // directory from the top output directory. - this->HomeRelativeOutputPath = - this->Convert(this->Makefile->GetCurrentBinaryDirectory(), HOME_OUTPUT); - if (this->HomeRelativeOutputPath == ".") - { - this->HomeRelativeOutputPath = ""; - } - this->cmLocalGenerator::Configure(); -} diff --git a/Source/cmLocalGhsMultiGenerator.h b/Source/cmLocalGhsMultiGenerator.h index ec25cba1c..0d11315ea 100644 --- a/Source/cmLocalGhsMultiGenerator.h +++ b/Source/cmLocalGhsMultiGenerator.h @@ -29,20 +29,11 @@ public: virtual ~cmLocalGhsMultiGenerator(); - /// @returns the relative path between the HomeOutputDirectory and this - /// local generators StartOutputDirectory. - std::string GetHomeRelativeOutputPath() const - { - return this->HomeRelativeOutputPath; - } - /** * Generate the makefile for this directory. */ virtual void Generate(); - /// Overloaded methods. @see cmLocalGenerator::Configure() - virtual void Configure(); const char *GetBuildFileName() { return this->BuildFileName.c_str(); } protected: @@ -50,7 +41,6 @@ protected: private: std::string BuildFileName; - std::string HomeRelativeOutputPath; }; #endif