mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-11 17:49:38 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'features-cleanups'

Browse Source 
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.
This commit is contained in:
Brad King
2014-06-16 08:54:48 -04:00
committed by CMake Topic Stage
parent 0b028c6f0a f0a0f3dcb4
commit e2789429aa
4 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmLocalGenerator.cxx
View File

@@ -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;
}
}