kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Brad King 2007-03-08 15:24:01 -05:00
parent 1a734f238a
commit 789a0f8359
2 changed files with 0 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Source/cmGlobalXCodeGenerator.cxx
View File

@ -211,49 +211,6 @@ std::string cmGlobalXCodeGenerator
return makeCommand; return makeCommand;
} }
//----------------------------------------------------------------------------
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 ///! Create a local generator appropriate to this Global Generator
cmLocalGenerator *cmGlobalXCodeGenerator::CreateLocalGenerator() cmLocalGenerator *cmGlobalXCodeGenerator::CreateLocalGenerator()
@ -1108,7 +1065,6 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
std::string& productName, std::string& productName,
const char* configName) const char* configName)
{ {
this->ConfigureOutputPaths();
std::string flags; std::string flags;
std::string defFlags; std::string defFlags;
bool shared = ((target.GetType() == cmTarget::SHARED_LIBRARY) || bool shared = ((target.GetType() == cmTarget::SHARED_LIBRARY) ||

3
Source/cmGlobalXCodeGenerator.h
View File

@ -146,7 +146,6 @@ private:
std::vector<cmXCodeObject*>&); std::vector<cmXCodeObject*>&);
void AddDependTarget(cmXCodeObject* target, void AddDependTarget(cmXCodeObject* target,
cmXCodeObject* dependTarget); cmXCodeObject* dependTarget);
void ConfigureOutputPaths();
void CreateXCodeDependHackTarget(std::vector<cmXCodeObject*>& targets); void CreateXCodeDependHackTarget(std::vector<cmXCodeObject*>& targets);
bool SpecialTargetEmitted(std::string const& tname); bool SpecialTargetEmitted(std::string const& tname);
void AddExtraTargets(cmLocalGenerator* root, void AddExtraTargets(cmLocalGenerator* root,
@ -179,8 +178,6 @@ private:
std::string CurrentXCodeHackMakefile; std::string CurrentXCodeHackMakefile;
std::string CurrentProject; std::string CurrentProject;
std::string OutputDir; std::string OutputDir;
std::string LibraryOutputPath;
std::string ExecutableOutputPath;
std::set<cmStdString> TargetDoneSet; std::set<cmStdString> TargetDoneSet;
std::vector<std::string> CurrentOutputDirectoryComponents; std::vector<std::string> CurrentOutputDirectoryComponents;
std::vector<std::string> ProjectOutputDirectoryComponents; std::vector<std::string> ProjectOutputDirectoryComponents;