dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-08 00:30:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport-fix-lang-std-option-list' into fix-lang-std-option-list

Browse Source
This commit is contained in:
Brad King
2017-07-14 10:19:59 -04:00
parent fca0546175 218ce158f2
commit 74e337117f
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmLocalGenerator.cxx
View File

@@ -1647,7 +1647,11 @@ void cmLocalGenerator::AddCompilerRequirementFlag(
const char* opt = const char* opt =
target->Target->GetMakefile()->GetRequiredDefinition(option_flag); target->Target->GetMakefile()->GetRequiredDefinition(option_flag);
this->AppendFlagEscape(flags, opt); std::vector<std::string> optVec;
cmSystemTools::ExpandListArgument(opt, optVec);
for (size_t i = 0; i < optVec.size(); ++i) {
this->AppendFlagEscape(flags, optVec[i]);
}
return; return;
} }
@@ -1660,7 +1664,11 @@ void cmLocalGenerator::AddCompilerRequirementFlag(
if (const char* opt = if (const char* opt =
target->Target->GetMakefile()->GetDefinition(option_flag)) { target->Target->GetMakefile()->GetDefinition(option_flag)) {
this->AppendFlagEscape(flags, opt); std::vector<std::string> optVec;
cmSystemTools::ExpandListArgument(opt, optVec);
for (size_t i = 0; i < optVec.size(); ++i) {
this->AppendFlagEscape(flags, optVec[i]);
}
return; return;
} }
} }