diff options
| author | Brad King <brad.king@kitware.com> | 2021-11-09 12:52:48 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-11-09 12:53:18 (GMT) |
| commit | 95ea17dfd313413301e86765ddf1c0cd817fde9a (patch) | |
| tree | fbd0fe59be0044299303966c74250eda9d5829db /Source | |
| parent | 2eb96cbe41b4ac01926e4332c47e2e3e9027c039 (diff) | |
| parent | 244550997f83294d8fd1e91665b87ab6185a3033 (diff) | |
| download | CMake-95ea17dfd313413301e86765ddf1c0cd817fde9a.zip CMake-95ea17dfd313413301e86765ddf1c0cd817fde9a.tar.gz CMake-95ea17dfd313413301e86765ddf1c0cd817fde9a.tar.bz2 | |
Merge topic 'nmc-reuse-from' into release-3.22
244550997f PCH: Fixed Ninja Multi-Config and REUSE_FROM for MSVC
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6713
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 468ce5c..fc5e6e5 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -2754,7 +2754,7 @@ void cmLocalGenerator::CopyPchCompilePdb( bool stdPipesUTF8 = true; auto configGenex = [&](cm::string_view expr) -> std::string { - if (this->GetGlobalGenerator()->IsVisualStudio()) { + if (this->GetGlobalGenerator()->IsMultiConfig()) { return cmStrCat("$<$<CONFIG:", config, ">:", expr, ">"); } return std::string(expr); @@ -2773,8 +2773,8 @@ void cmLocalGenerator::CopyPchCompilePdb( std::vector<std::string> no_byproducts; std::vector<std::string> outputs; - outputs.push_back( - cmStrCat(target_compile_pdb_dir, pdb_prefix, ReuseFrom, ".pdb")); + outputs.push_back(configGenex( + cmStrCat(target_compile_pdb_dir, pdb_prefix, ReuseFrom, ".pdb"))); if (this->GetGlobalGenerator()->IsVisualStudio()) { this->AddCustomCommandToTarget( |