diff options
| author | Brad King <brad.king@kitware.com> | 2013-06-03 13:57:44 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-06-03 13:57:44 (GMT) |
| commit | e57b6a25211ea28b7b01aadfc3aaf1de79455bdb (patch) | |
| tree | 3957355de7d91f18e663fc1ed13185bf31f35125 /Source/cmGlobalXCodeGenerator.cxx | |
| parent | bcc29c56a599baa3e2d8bd1d56e3727911a1c7d7 (diff) | |
| parent | 24466f22c0c0e3235f0a21bd2a298c39df50e2f3 (diff) | |
| download | CMake-e57b6a25211ea28b7b01aadfc3aaf1de79455bdb.zip CMake-e57b6a25211ea28b7b01aadfc3aaf1de79455bdb.tar.gz CMake-e57b6a25211ea28b7b01aadfc3aaf1de79455bdb.tar.bz2 | |
Merge topic 'target-COMPILE_OPTIONS'
24466f2 Add target_compile_options command.
80ca9c4 Add COMPILE_OPTIONS target property.
7cb2308 cmTarget: Rename LinkInterfaceIncludeDirectoriesEntries
47f80d9 cmTarget: Rename struct to be more re-usable.
1319a14 Add <LANG>_COMPILER_ID generator expressions.
3549676 Add cmLocalGenerator::GetCompileOptions.
f3ad863 VS6: Rename some variables to correspond to config values.
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 d782a06..2d76c82 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)) |