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:57 (GMT) |
| commit | 9b0c7273e07fb85d0ebe9d0f2a1906b233905f30 (patch) | |
| tree | 538b1c763207e4f5424512698d3819f4e705d6ef /Source | |
| parent | 5ef23640535dfd6543bd81c86282e38122169af6 (diff) | |
| parent | 35432aabdaf16611ef5faf0e3eec29b7847c1026 (diff) | |
| download | CMake-9b0c7273e07fb85d0ebe9d0f2a1906b233905f30.zip CMake-9b0c7273e07fb85d0ebe9d0f2a1906b233905f30.tar.gz CMake-9b0c7273e07fb85d0ebe9d0f2a1906b233905f30.tar.bz2 | |
Merge topic 'pch-ios-multi-arch-nmc' into release-3.19
35432aabda PCH: Fix compiler errors on iOS multi-arch using Ninja Multi-Config
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5544
Diffstat (limited to 'Source')
| -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 4e6010c..65ddf95 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -2506,8 +2506,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, ">")); } } |