diff options
| author | Brad King <brad.king@kitware.com> | 2013-06-28 13:04:01 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-06-28 13:04:01 (GMT) |
| commit | daaf6283f5c0e8b7ea7ee93f983ad56d4498788d (patch) | |
| tree | 3ad2b5c4c089f7c66a7af374f6c106e53304b4cf /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | 2ed149caefb6b9c60f8e93058d5431727c650116 (diff) | |
| parent | d221eac81261679d3580849218220290fcd122df (diff) | |
| download | CMake-daaf6283f5c0e8b7ea7ee93f983ad56d4498788d.zip CMake-daaf6283f5c0e8b7ea7ee93f983ad56d4498788d.tar.gz CMake-daaf6283f5c0e8b7ea7ee93f983ad56d4498788d.tar.bz2 | |
Merge topic 'refactor-compile-options'
d221eac Refactor target COMPILE_OPTIONS and COMPILE_FLAGS handling
b6385ca Escape target flags taken from COMPILE_OPTIONS
0c9cc9a Embarcadero: Use response files only for includes, objects, and libs
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 7e3f444..479721a 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -1276,17 +1276,10 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions( { flags += " /TP "; } + this->LocalGenerator->AddCompileOptions(flags, this->Target, + linkLanguage, configName.c_str()); } - std::string targetFlags; - this->LocalGenerator->GetCompileOptions(targetFlags, this->Target, - configName.c_str()); - // Add the target-specific flags. - if(!targetFlags.empty()) - { - flags += " "; - flags += targetFlags; - } // Get preprocessor definitions for this directory. std::string defineFlags = this->Target->GetMakefile()->GetDefineFlags(); clOptions.FixExceptionHandlingDefault(); |