diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-05-16 12:59:04 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-06-02 09:56:36 (GMT) |
| commit | 35496761a58956bd8c5ad65a3ed9ee78d09af56b (patch) | |
| tree | f02c889f4da5c1da5d9a6eef5d9ea73fbc0f1a16 /Source/cmGlobalXCodeGenerator.cxx | |
| parent | f3ad863ae6f0487bbf80d95b0d3f622840187a6a (diff) | |
| download | CMake-35496761a58956bd8c5ad65a3ed9ee78d09af56b.zip CMake-35496761a58956bd8c5ad65a3ed9ee78d09af56b.tar.gz CMake-35496761a58956bd8c5ad65a3ed9ee78d09af56b.tar.bz2 | |
Add cmLocalGenerator::GetCompileOptions.
Currently it only adds the contents of the COMPILE_FLAGS target
property, but it can be extended to handle a new COMPILE_OPTIONS
generator expression enabled property.
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index bb1e792..10de35a 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -681,9 +681,11 @@ cmGlobalXCodeGenerator::CreateXCodeSourceFile(cmLocalGenerator* lg, { // Add flags from target and source file properties. std::string flags; - if(cmtarget.GetProperty("COMPILE_FLAGS")) + std::string targetFlags; + lg->GetCompileOptions(targetFlags, &cmtarget, 0); // TODO: Config? + if(!targetFlags.empty()) { - lg->AppendFlags(flags, cmtarget.GetProperty("COMPILE_FLAGS")); + lg->AppendFlags(flags, targetFlags.c_str()); } const char* srcfmt = sf->GetProperty("Fortran_FORMAT"); switch(this->CurrentLocalGenerator->GetFortranFormat(srcfmt)) |