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

Keep Xcode intermediate files away from output dir 

Previously the Xcode generator set SYMROOT to be the target output
directory.  This told Xcode to put the "<proj>.build" directory in the
output path too.

This commit sets SYMROOT, CONFIGURATION_BUILD_DIR, and OBJROOT to put
intermediate files in the build directory corresponding to the source
directory that created each target.  This is more consistent with the VS
IDE generators.  Now only the build output files (actual targets) go to
the target output directory.
This commit is contained in:
Brad King 2009-10-28 09:12:38 -04:00
parent e0d0d5db0f
commit 95038439ea
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/cmGlobalXCodeGenerator.cxx
View File

@ -1564,7 +1564,18 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
target.GetType() == cmTarget::MODULE_LIBRARY || target.GetType() == cmTarget::MODULE_LIBRARY ||
target.GetType() == cmTarget::EXECUTABLE) target.GetType() == cmTarget::EXECUTABLE)
{ {
pndir = target.GetDirectory(); if(this->XcodeVersion >= 21)
{
std::string pncdir = target.GetDirectory(configName);
buildSettings->AddAttribute("CONFIGURATION_BUILD_DIR",
this->CreateString(pncdir.c_str()));
}
else
{
buildSettings->AddAttribute("OBJROOT",
this->CreateString(pndir.c_str()));
pndir = target.GetDirectory(configName);
}
buildSettings->AddAttribute("EXECUTABLE_PREFIX", buildSettings->AddAttribute("EXECUTABLE_PREFIX",
this->CreateString(pnprefix.c_str())); this->CreateString(pnprefix.c_str()));
buildSettings->AddAttribute("EXECUTABLE_SUFFIX", buildSettings->AddAttribute("EXECUTABLE_SUFFIX",
@ -2910,7 +2921,8 @@ cmGlobalXCodeGenerator::CreateXCodeDependHackTarget(
// then remove those exectuables as well // then remove those exectuables as well
if(this->Architectures.size() > 1) if(this->Architectures.size() > 1)
{ {
std::string universal = t->GetDirectory(); std::string universal =
t->GetMakefile()->GetCurrentOutputDirectory();
universal += "/"; universal += "/";
universal += this->CurrentProject; universal += this->CurrentProject;
universal += ".build/"; universal += ".build/";