mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 05:40:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'fix-C-standard-features'

Browse Source 
fb3487a9 Features: Fix C90 feature detection.
6027798a Features: Allow setting standard dialect below the default.
9d767810 Features: Populate CMAKE_<LANG>_STANDARD_DEFAULT only for supported compilers.
72537e44 Features: Add dialect compile flags only if default is known.
82c9d686 AppleClang: Remove redundant UNIX condition.
This commit is contained in:
Brad King
2015-02-05 09:25:14 -05:00
committed by CMake Topic Stage
parent 0ae11b1fb0 fb3487a997
commit 9042c875dc
16 changed files with 200 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Source/cmLocalGenerator.cxx
View File

@@ -2205,7 +2205,7 @@ AddCompilerRequirementFlag(std::string &flags, cmTarget* target,
}
const char* defaultStd
= this->Makefile->GetDefinition("CMAKE_" + lang + "_STANDARD_DEFAULT");
if (defaultStd && !*defaultStd)
if (!defaultStd || !*defaultStd)
{
// This compiler has no notion of language standard levels.
return;
@@ -2272,18 +2272,32 @@ AddCompilerRequirementFlag(std::string &flags, cmTarget* target,
std::find(stds.begin(), stds.end(), standard);
assert(stdIt != stds.end());
std::vector<std::string>::const_iterator defaultStdIt;
if (defaultStd)
std::vector<std::string>::const_iterator defaultStdIt =
std::find(stds.begin(), stds.end(), defaultStd);
if (defaultStdIt == stds.end())
{
defaultStdIt = std::find(stds.begin(), stds.end(), defaultStd);
assert(defaultStdIt != stds.end());
}
else
{
defaultStdIt = stds.end() - 1;
std::string e =
"CMAKE_" + lang + "_STANDARD_DEFAULT is set to invalid value '" +
std::string(defaultStd) + "'";
this->Makefile->IssueMessage(cmake::INTERNAL_ERROR, e);
return;
}
for ( ; stdIt <= defaultStdIt; ++stdIt)
// Greater or equal because the standards are stored in
// backward chronological order.
if (stdIt >= defaultStdIt)
{
std::string option_flag =
"CMAKE_" + lang + *stdIt
+ "_" + type + "_COMPILE_OPTION";
const char *opt =
target->GetMakefile()->GetRequiredDefinition(option_flag);
this->AppendFlagEscape(flags, opt);
return;
}
for ( ; stdIt < defaultStdIt; ++stdIt)
{
std::string option_flag =
"CMAKE_" + lang + *stdIt