summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalGenerator.cxx
diff options
context:
space:
mode:
authorCristian Adam <cristian.adam@gmail.com>2021-11-08 17:16:36 (GMT)
committerCristian Adam <cristian.adam@gmail.com>2021-11-08 17:16:36 (GMT)
commit244550997f83294d8fd1e91665b87ab6185a3033 (patch)
treed2a0c73f2a4e206167cac6c2811366f0921432f4 /Source/cmLocalGenerator.cxx
parente137ce0a5243b923ab5fb0be6f5f1bdc9ecf805d (diff)
downloadCMake-244550997f83294d8fd1e91665b87ab6185a3033.zip
CMake-244550997f83294d8fd1e91665b87ab6185a3033.tar.gz
CMake-244550997f83294d8fd1e91665b87ab6185a3033.tar.bz2
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.
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
-rw-r--r--Source/cmLocalGenerator.cxx6
1 files 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("$<$<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(