Commit 8c7facd6 authored by Brad King's avatar Brad King
Browse files

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

parents 13e9a370 218ce158
...@@ -1591,7 +1591,11 @@ void cmLocalGenerator::AddCompilerRequirementFlag( ...@@ -1591,7 +1591,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;
} }
...@@ -1601,7 +1605,11 @@ void cmLocalGenerator::AddCompilerRequirementFlag( ...@@ -1601,7 +1605,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;
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment