mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-26 08:08:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'pch-no-duplicates'

Browse Source 
e01935ac9d PCH: No repeated path for internal generated PCH files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4030
This commit is contained in:
Craig Scott
2019-11-12 13:28:34 +00:00
committed by Kitware Robot
parent bec38523de e01935ac9d
commit 9a935adca9
6 changed files with 17 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmGeneratorTarget.cxx
+2 -8
View File
@@ -3376,14 +3376,8 @@ std::string cmGeneratorTarget::GetPchHeader(const std::string& config,
this->GetGlobalGenerator()->FindGeneratorTarget(pchReuseFrom);
}
if (this->GetGlobalGenerator()->IsMultiConfig()) {
filename = cmStrCat(
generatorTarget->LocalGenerator->GetCurrentBinaryDirectory(), "/");
} else {
// For GCC we need to have the header file .h[xx]
// next to the .h[xx].gch file
filename = generatorTarget->ObjectDirectory;
}
filename = cmStrCat(
generatorTarget->LocalGenerator->GetCurrentBinaryDirectory(), "/");
const std::map<std::string, std::string> languageToExtension = {
{ "C", ".h" },