From 244550997f83294d8fd1e91665b87ab6185a3033 Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Mon, 8 Nov 2021 18:16:36 +0100 Subject: PCH: Fixed Ninja Multi-Config and REUSE_FROM for MSVC The copy_idb_pdb.cmake script would be executed for every configuration for all configurations. Debug would still want to get the RelWithDebInfo files, and the other way around. --- Source/cmLocalGenerator.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 9b6b9abe..8d03c44 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("$<$:", expr, ">"); } return std::string(expr); @@ -2773,8 +2773,8 @@ void cmLocalGenerator::CopyPchCompilePdb( std::vector no_byproducts; std::vector 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( -- cgit v0.12