diff options
| author | Brad King <brad.king@kitware.com> | 2020-05-08 12:03:12 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-05-08 12:03:44 (GMT) |
| commit | 195090f9f0a658350827be618571377094903cec (patch) | |
| tree | 083e1668a37376790dd328ebb5110cd37b260502 /Source | |
| parent | fb4959eadc91699408910115bb6cf083b9113a60 (diff) | |
| parent | a2ee941aba7409c331f18b48b03a41930cd593b3 (diff) | |
| download | CMake-195090f9f0a658350827be618571377094903cec.zip CMake-195090f9f0a658350827be618571377094903cec.tar.gz CMake-195090f9f0a658350827be618571377094903cec.tar.bz2 | |
Merge topic 'pch-reuse-multi'
a2ee941aba Merge branch 'backport-pch-reuse-multi' into pch-reuse-multi
605d6c65c9 PCH: Fix REUSE_FROM in multi-config generators
7a1c7736cb PCH: Fix REUSE_FROM in multi-config generators
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4717
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index b862449..9aca775 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -2732,9 +2732,11 @@ void cmLocalGenerator::AddPchDependencies(cmGeneratorTarget* target) std::string pchSourceObj = reuseTarget->GetPchFileObject(config, lang, arch); + const std::string configUpper = cmSystemTools::UpperCase(config); + // Link to the pch object file target->Target->AppendProperty( - "LINK_FLAGS", + cmStrCat("LINK_FLAGS_", configUpper), cmStrCat(" ", this->ConvertToOutputFormat(pchSourceObj, SHELL)), true); |