diff options
| author | Brad King <brad.king@kitware.com> | 2014-06-16 12:54:48 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-06-16 12:54:48 (GMT) |
| commit | e2789429aaa18dd7aef4858fb2702bf66d50aa6e (patch) | |
| tree | 90c741f584bf1f4316f667666450638366da909d /Source | |
| parent | 0b028c6f0a44d3b0956170b39fbe921eb8d13f42 (diff) | |
| parent | f0a0f3dcb42ee249d7ba0c09e674900adfb9ea2e (diff) | |
| download | CMake-e2789429aaa18dd7aef4858fb2702bf66d50aa6e.zip CMake-e2789429aaa18dd7aef4858fb2702bf66d50aa6e.tar.gz CMake-e2789429aaa18dd7aef4858fb2702bf66d50aa6e.tar.bz2 | |
Merge topic 'features-cleanups'
f0a0f3dc WCDH: Fix compiler id test for compatibility macros.
627ad96b Project: Detect other compilers before detecting Clang.
bc950169 WCDH: Remove noise from generated defines.
eecd93fc Features: Escape the COMPILE_OPTIONS for dialects.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index c8c8c79..8ae1157 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -2229,7 +2229,10 @@ AddCompilerRequirementFlag(std::string &flags, cmTarget* target, "does not know the compile flags to use to enable it."; this->GetMakefile()->IssueMessage(cmake::FATAL_ERROR, e.str()); } - this->AppendFlags(flags, opt); + else + { + this->AppendFlagEscape(flags, opt); + } return; } @@ -2275,7 +2278,7 @@ AddCompilerRequirementFlag(std::string &flags, cmTarget* target, if (const char *opt = target->GetMakefile()->GetDefinition(option_flag)) { - this->AppendFlags(flags, opt); + this->AppendFlagEscape(flags, opt); return; } } |