mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 21:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'nmc-reuse-from' into release-3.22

Browse Source 
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
This commit is contained in:
Brad King
2021-11-09 12:52:48 +00:00
committed by Kitware Robot
parent 2eb96cbe41 244550997f
commit 95ea17dfd3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmLocalGenerator.cxx
View File

@@ -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(