summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGregor Jasny <gjasny@googlemail.com>2016-01-03 10:53:38 (GMT)
committerGregor Jasny <gjasny@googlemail.com>2016-01-03 11:06:56 (GMT)
commit28f98ceef1770fe252c0c3c1e59aca773cc64009 (patch)
tree5af360a9a54d038d6e66f8e747ef82d84528bae5
parent28db2268e8e36521626071a39596b9aaa87defbb (diff)
downloadCMake-28f98ceef1770fe252c0c3c1e59aca773cc64009.zip
CMake-28f98ceef1770fe252c0c3c1e59aca773cc64009.tar.gz
CMake-28f98ceef1770fe252c0c3c1e59aca773cc64009.tar.bz2
Xcode: Make CMAKE_XCODE_ATTRIBUTE calculation last step (#14947)
-rw-r--r--Source/cmGlobalXCodeGenerator.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index c9d2742..6f192cb 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -3527,6 +3527,10 @@ bool cmGlobalXCodeGenerator
this->CreateString(this->GeneratorToolset.c_str()));
}
+ std::string symroot = root->GetCurrentBinaryDirectory();
+ symroot += "/build";
+ buildSettings->AddAttribute("SYMROOT", this->CreateString(symroot.c_str()));
+
// Put this last so it can override existing settings
// Convert "CMAKE_XCODE_ATTRIBUTE_*" variables directly.
{
@@ -3543,10 +3547,6 @@ bool cmGlobalXCodeGenerator
}
}
- std::string symroot = root->GetCurrentBinaryDirectory();
- symroot += "/build";
- buildSettings->AddAttribute("SYMROOT", this->CreateString(symroot.c_str()));
-
for( std::vector<cmXCodeObject*>::iterator i = configs.begin();
i != configs.end(); ++i)
{