summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalXCodeGenerator.cxx
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2006-01-25 13:38:06 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2006-01-25 13:38:06 (GMT)
commit07ef88c985a66cec5126930dbc3cfd736072183e (patch)
treecc9834e4f1f898845408fa21c006d4f9c391b318 /Source/cmGlobalXCodeGenerator.cxx
parent008406a96c66afaa6a3e1105c730cffd1b1e8bc8 (diff)
downloadCMake-07ef88c985a66cec5126930dbc3cfd736072183e.zip
CMake-07ef88c985a66cec5126930dbc3cfd736072183e.tar.gz
CMake-07ef88c985a66cec5126930dbc3cfd736072183e.tar.bz2
ENH: add COMPILE_FLAGS to targets
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
-rw-r--r--Source/cmGlobalXCodeGenerator.cxx10
1 files changed, 7 insertions, 3 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 9a2af69..0879224 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -466,12 +466,16 @@ cmXCodeObject* cmGlobalXCodeGenerator::CreateObjectReference(cmXCodeObject* ref)
//----------------------------------------------------------------------------
cmXCodeObject*
cmGlobalXCodeGenerator::CreateXCodeSourceFile(cmLocalGenerator* lg,
- cmSourceFile* sf)
+ cmSourceFile* sf,
+ cmTarget& cmtarget)
{
std::string flags;
// Add flags from source file properties.
+ if(cmtarget.GetProperty("COMPILE_FLAGS"))
+ {
+ lg->AppendFlags(flags, cmtarget.GetProperty("COMPILE_FLAGS"));
+ }
lg->AppendFlags(flags, sf->GetProperty("COMPILE_FLAGS"));
-
cmXCodeObject* fileRef = this->CreateObject(cmXCodeObject::PBXFileReference);
cmXCodeObject* group = m_GroupMap[sf];
@@ -650,7 +654,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
i != classes.end(); ++i)
{
cmXCodeObject* xsf =
- this->CreateXCodeSourceFile(m_CurrentLocalGenerator, *i);
+ this->CreateXCodeSourceFile(m_CurrentLocalGenerator, *i, cmtarget);
cmXCodeObject* fr = xsf->GetObject("fileRef");
cmXCodeObject* filetype =
fr->GetObject()->GetObject("lastKnownFileType");