ENH: Removed unused variables LibraryOutputPath and ExecutableOutputPath. Each target is asked for its own output directory. This is a step towards bug#2240.

2 files changed, 0 insertions, 47 deletions

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index fdcc12f..77715fb 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -212,49 +212,6 @@ std::string cmGlobalXCodeGenerator
 }
 
 //----------------------------------------------------------------------------
-void cmGlobalXCodeGenerator::ConfigureOutputPaths()
-{
-  // Format the library and executable output paths.
-  this->LibraryOutputPath = 
-    this->CurrentMakefile->GetSafeDefinition("LIBRARY_OUTPUT_PATH");
-  if(this->LibraryOutputPath.size() == 0)
-    {
-    this->LibraryOutputPath = 
-      this->CurrentMakefile->GetCurrentOutputDirectory();
-    }
-  // make sure there is a trailing slash
-  if(this->LibraryOutputPath.size() && 
-     this->LibraryOutputPath[this->LibraryOutputPath.size()-1] != '/')
-    {
-    this->LibraryOutputPath += "/";
-    if(!cmSystemTools::MakeDirectory(this->LibraryOutputPath.c_str()))
-      {
-      cmSystemTools::Error("Error creating directory ",
-                           this->LibraryOutputPath.c_str());
-      }
-    }
-  this->CurrentMakefile->AddLinkDirectory(this->LibraryOutputPath.c_str());
-  this->ExecutableOutputPath = 
-    this->CurrentMakefile->GetSafeDefinition("EXECUTABLE_OUTPUT_PATH");
-  if(this->ExecutableOutputPath.size() == 0)
-    {
-    this->ExecutableOutputPath = 
-      this->CurrentMakefile->GetCurrentOutputDirectory();
-    }
-  // make sure there is a trailing slash
-  if(this->ExecutableOutputPath.size() && 
-     this->ExecutableOutputPath[this->ExecutableOutputPath.size()-1] != '/')
-    {
-    this->ExecutableOutputPath += "/";
-    if(!cmSystemTools::MakeDirectory(this->ExecutableOutputPath.c_str()))
-      {
-      cmSystemTools::Error("Error creating directory ",
-                           this->ExecutableOutputPath.c_str());
-      }
-    }
-}
-
-//----------------------------------------------------------------------------
 ///! Create a local generator appropriate to this Global Generator
 cmLocalGenerator *cmGlobalXCodeGenerator::CreateLocalGenerator()
 {
@@ -1108,7 +1065,6 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
                                                  std::string& productName,
                                                  const char* configName)
 {
-  this->ConfigureOutputPaths();
   std::string flags;
   std::string defFlags;
   bool shared = ((target.GetType() == cmTarget::SHARED_LIBRARY) ||
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index 27470d6..e9091e4 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -146,7 +146,6 @@ private:
                           std::vector<cmXCodeObject*>&);
   void AddDependTarget(cmXCodeObject* target,
                        cmXCodeObject* dependTarget);
-  void ConfigureOutputPaths();
   void CreateXCodeDependHackTarget(std::vector<cmXCodeObject*>& targets);
   bool SpecialTargetEmitted(std::string const& tname);
   void AddExtraTargets(cmLocalGenerator* root, 
@@ -179,8 +178,6 @@ private:
   std::string CurrentXCodeHackMakefile;
   std::string CurrentProject;
   std::string OutputDir; 
-  std::string LibraryOutputPath;
-  std::string ExecutableOutputPath;
   std::set<cmStdString> TargetDoneSet;
   std::vector<std::string> CurrentOutputDirectoryComponents;
   std::vector<std::string> ProjectOutputDirectoryComponents;