summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-11-09 12:51:56 (GMT)
committerKitware Robot <kwrobot@kitware.com>2021-11-09 12:52:29 (GMT)
commit2eb96cbe41b4ac01926e4332c47e2e3e9027c039 (patch)
tree0bc387b21b88030d553de028ec6a4f6dec363de7
parent44849f14b0f5a8c3ff9ac47c9e8b9b0b56ac626f (diff)
parent95fa27d94df39fda5463c6644ff78c364dd4e47f (diff)
downloadCMake-2eb96cbe41b4ac01926e4332c47e2e3e9027c039.zip
CMake-2eb96cbe41b4ac01926e4332c47e2e3e9027c039.tar.gz
CMake-2eb96cbe41b4ac01926e4332c47e2e3e9027c039.tar.bz2
Merge topic 'msvc-pch-reuse-config' into release-3.22
95fa27d94d PCH: Fix REUSE_FROM when Debug and RelWithDebInfo configs differ Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !6712
-rw-r--r--Source/cmLocalGenerator.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 9b6b9abe..468ce5c 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2698,8 +2698,8 @@ void cmLocalGenerator::CopyPchCompilePdb(
cmStrCat(target->GetLocalGenerator()->GetCurrentBinaryDirectory(), "/",
target->GetName(), ".dir/");
- const std::string copy_script =
- cmStrCat(target_compile_pdb_dir, "copy_idb_pdb.cmake");
+ const std::string copy_script = cmStrCat(
+ target_compile_pdb_dir, "copy_idb_pdb_", config.c_str(), ".cmake");
cmGeneratedFileStream file(copy_script);
file << "# CMake generated file\n";