diff options
| author | Brad King <brad.king@kitware.com> | 2020-12-01 14:26:38 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-12-01 14:26:58 (GMT) |
| commit | 0f00d0171717a10053dcbb2cb6b3f06f89859272 (patch) | |
| tree | 352240a099875f8b881990c34025c07425650046 | |
| parent | a22a8f1e36628f32485b4aebed7cd30ee40c5b4a (diff) | |
| parent | 35432aabdaf16611ef5faf0e3eec29b7847c1026 (diff) | |
| download | CMake-0f00d0171717a10053dcbb2cb6b3f06f89859272.zip CMake-0f00d0171717a10053dcbb2cb6b3f06f89859272.tar.gz CMake-0f00d0171717a10053dcbb2cb6b3f06f89859272.tar.bz2 | |
Merge topic 'pch-ios-multi-arch-nmc'
35432aabda PCH: Fix compiler errors on iOS multi-arch using Ninja Multi-Config
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5544
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 8a3f285..f582701 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -2503,8 +2503,10 @@ void cmLocalGenerator::AddPchDependencies(cmGeneratorTarget* target) } if (!useMultiArchPch.empty()) { - target->Target->SetProperty( - cmStrCat(lang, "_COMPILE_OPTIONS_USE_PCH"), useMultiArchPch); + + target->Target->AppendProperty( + cmStrCat(lang, "_COMPILE_OPTIONS_USE_PCH"), + cmStrCat("$<$<CONFIG:", config, ">:", useMultiArchPch, ">")); } } |