diff options
author | Cristian Adam <cristian.adam@gmail.com> | 2020-04-02 12:16:43 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2020-04-02 15:51:19 (GMT) |
commit | f593b354da2e9637e9b869688934f0ba2544ebed (patch) | |
tree | 605f4a05ad9773e658fd14974f7000f769a90014 /Source/cmCommonTargetGenerator.cxx | |
parent | be154ea1e3efcd1a13952701337378a01ca0cd19 (diff) | |
download | CMake-f593b354da2e9637e9b869688934f0ba2544ebed.zip CMake-f593b354da2e9637e9b869688934f0ba2544ebed.tar.gz CMake-f593b354da2e9637e9b869688934f0ba2544ebed.tar.bz2 |
PCH: Add support for multi architecture iOS projects
Fixes: #20497
Diffstat (limited to 'Source/cmCommonTargetGenerator.cxx')
-rw-r--r-- | Source/cmCommonTargetGenerator.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx index 033cb60..939f757 100644 --- a/Source/cmCommonTargetGenerator.cxx +++ b/Source/cmCommonTargetGenerator.cxx @@ -98,17 +98,20 @@ void cmCommonTargetGenerator::AppendFortranFormatFlags( } std::string cmCommonTargetGenerator::GetFlags(const std::string& l, - const std::string& config) + const std::string& config, + const std::string& arch) { - auto i = this->Configs[config].FlagsByLanguage.find(l); - if (i == this->Configs[config].FlagsByLanguage.end()) { + const std::string key = config + arch; + + auto i = this->Configs[key].FlagsByLanguage.find(l); + if (i == this->Configs[key].FlagsByLanguage.end()) { std::string flags; this->LocalCommonGenerator->GetTargetCompileFlags(this->GeneratorTarget, - config, l, flags); + config, l, flags, arch); ByLanguageMap::value_type entry(l, flags); - i = this->Configs[config].FlagsByLanguage.insert(entry).first; + i = this->Configs[key].FlagsByLanguage.insert(entry).first; } return i->second; } |