From bd33da9fccf209f9f7f23b00db4b7305caab32a0 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 23 Sep 2009 14:10:08 -0400 Subject: Add Xcode SYMROOT setting for custom targets Xcode 1.5 writes helper scripts at the projectDirPath location for targets that do not set SYMROOT. We now add SYMROOT to custom targets so that all targets set it. This prevents Xcode 1.5 from touching the source directory now that we always set projectDirPath. See issue #8481. --- Source/cmGlobalXCodeGenerator.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index e695749..2603c0d 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -1531,19 +1531,20 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target, this->CreateString(pnbase.c_str())); // Set attributes to specify the proper name for the target. + std::string pndir = this->CurrentMakefile->GetCurrentOutputDirectory(); if(target.GetType() == cmTarget::STATIC_LIBRARY || target.GetType() == cmTarget::SHARED_LIBRARY || target.GetType() == cmTarget::MODULE_LIBRARY || target.GetType() == cmTarget::EXECUTABLE) { - std::string pndir = target.GetDirectory(); - buildSettings->AddAttribute("SYMROOT", - this->CreateString(pndir.c_str())); + pndir = target.GetDirectory(); buildSettings->AddAttribute("EXECUTABLE_PREFIX", this->CreateString(pnprefix.c_str())); buildSettings->AddAttribute("EXECUTABLE_SUFFIX", this->CreateString(pnsuffix.c_str())); } + buildSettings->AddAttribute("SYMROOT", + this->CreateString(pndir.c_str())); // Handle settings for each target type. switch(target.GetType()) -- cgit v0.12