diff options
| author | Brad King <brad.king@kitware.com> | 2017-07-14 14:20:12 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-07-14 14:20:12 (GMT) |
| commit | 8c7facd69b63f986d8d35c22d7e40cddc7da9467 (patch) | |
| tree | 867913f230ab21d414a04a1a5364ba505f9919da | |
| parent | 13e9a370d9567d68120396b785c5d9e91a7cc5b8 (diff) | |
| parent | 218ce158f2d9b25bc5789a28d742736129cdb088 (diff) | |
| download | CMake-8c7facd69b63f986d8d35c22d7e40cddc7da9467.zip CMake-8c7facd69b63f986d8d35c22d7e40cddc7da9467.tar.gz CMake-8c7facd69b63f986d8d35c22d7e40cddc7da9467.tar.bz2 | |
Merge branch 'backport-fix-lang-std-option-list' into release-3.9
| -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 5a062bc..6ce31c5 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1591,7 +1591,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; } @@ -1601,7 +1605,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; } } |