diff options
| author | Brad King <brad.king@kitware.com> | 2017-07-14 14:19:59 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-07-14 14:19:59 (GMT) |
| commit | 74e337117f839378e284b7edddc8484ce9c683f5 (patch) | |
| tree | 300221c73ba385923362c602f8aabfedb75f3573 /Source/cmLocalGenerator.cxx | |
| parent | fca0546175edf6cae51bbf673fa379899e8c0ea6 (diff) | |
| parent | 218ce158f2d9b25bc5789a28d742736129cdb088 (diff) | |
| download | CMake-74e337117f839378e284b7edddc8484ce9c683f5.zip CMake-74e337117f839378e284b7edddc8484ce9c683f5.tar.gz CMake-74e337117f839378e284b7edddc8484ce9c683f5.tar.bz2 | |
Merge branch 'backport-fix-lang-std-option-list' into fix-lang-std-option-list
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 2bd7e4e..f1bf664 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1647,7 +1647,11 @@ void cmLocalGenerator::AddCompilerRequirementFlag( const char* opt = 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; } @@ -1660,7 +1664,11 @@ void cmLocalGenerator::AddCompilerRequirementFlag( if (const char* opt = 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; } } |