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 | 3fa0381e9e062649722fc6051a86f21260359663 (patch) | |
| tree | acaaef790769e7d8346f6703a2186cd32d7a2a93 /Source | |
| parent | 6ccbf6ba711864d4498b211a58ef8449a4e0fa34 (diff) | |
| parent | 7a1c7736cb3f867f916509d38bc88e75eaa7be3f (diff) | |
| download | CMake-3fa0381e9e062649722fc6051a86f21260359663.zip CMake-3fa0381e9e062649722fc6051a86f21260359663.tar.gz CMake-3fa0381e9e062649722fc6051a86f21260359663.tar.bz2 | |
Merge topic 'pch-reuse-multi' into release-3.17
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 c2ec5f5..f592b7b 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -2604,9 +2604,11 @@ void cmLocalGenerator::AddPchDependencies(cmGeneratorTarget* target) std::string pchSourceObj = reuseTarget->GetPchFileObject(config, lang); + 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); } |