[cmake-commits] king committed cmGlobalXCodeGenerator.cxx 1.136 1.137 cmGlobalXCodeGenerator.h 1.44 1.45

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv3011

Modified Files:
	cmGlobalXCodeGenerator.cxx cmGlobalXCodeGenerator.h 
Log Message:
ENH: Removed unused variables LibraryOutputPath and ExecutableOutputPath.  Each target is asked for its own output directory.  This is a step towards bug#2240.


Index: cmGlobalXCodeGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalXCodeGenerator.cxx,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- cmGlobalXCodeGenerator.cxx	7 Mar 2007 21:32:29 -0000	1.136
+++ cmGlobalXCodeGenerator.cxx	8 Mar 2007 20:24:01 -0000	1.137
@@ -212,49 +212,6 @@
 }
 
 //----------------------------------------------------------------------------
-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 @@
                                                  std::string& productName,
                                                  const char* configName)
 {
-  this->ConfigureOutputPaths();
   std::string flags;
   std::string defFlags;
   bool shared = ((target.GetType() == cmTarget::SHARED_LIBRARY) ||

Index: cmGlobalXCodeGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalXCodeGenerator.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- cmGlobalXCodeGenerator.h	16 Feb 2007 21:12:16 -0000	1.44
+++ cmGlobalXCodeGenerator.h	8 Mar 2007 20:24:01 -0000	1.45
@@ -146,7 +146,6 @@
                           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 @@
   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;