mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-09 15:20:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

VS: Simplify generation of per-source PCH settings

Browse Source 
Avoid looking up the PCH create/use flags just to map them through
flag tables back to the `.vcxproj` settings.  Instead, simply
generate the PCH settings directly for each source file.

Since commit 9df1f33c9a (VisualStudio: move PCH rules to projects when
possible., 2020-10-15, v3.20.0-rc1~638^2) we already do this for the
target-wide PCH settings.
This commit is contained in:
Brad King
2022-02-03 15:46:24 -05:00
parent 3d85c0072d
commit dd1e2cc80c
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Source/cmVisualStudio10TargetGenerator.cxx
View File

@@ -2736,11 +2736,15 @@ void cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
if (needsPCHFlags) {
// Add precompile headers compile options.
std::string expandedOptions;
std::string pchOptions;
if (makePCH) {
pchOptions =
this->GeneratorTarget->GetPchCreateCompileOptions(config, lang);
clOptions.AddFlag("PrecompiledHeader", "Create");
std::string pchHeader =
this->GeneratorTarget->GetPchHeader(config, lang);
clOptions.AddFlag("PrecompiledHeaderFile", pchHeader);
std::string pchFile =
this->GeneratorTarget->GetPchFile(config, lang);
clOptions.AddFlag("PrecompiledHeaderOutputFile", pchFile);
clOptions.AddFlag("ForcedIncludeFiles", pchHeader);
} else if (useNoPCH) {
clOptions.AddFlag("PrecompiledHeader", "NotUsing");
} else if (useSharedPCH) {
@@ -2748,12 +2752,15 @@ void cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
this->GeneratorTarget->GetPchHeader(config, lang);
clOptions.AddFlag("ForcedIncludeFiles", pchHeader);
} else if (useDifferentLangPCH) {
pchOptions =
this->GeneratorTarget->GetPchUseCompileOptions(config, lang);
clOptions.AddFlag("PrecompiledHeader", "Use");
std::string pchHeader =
this->GeneratorTarget->GetPchHeader(config, lang);
clOptions.AddFlag("PrecompiledHeaderFile", pchHeader);
std::string pchFile =
this->GeneratorTarget->GetPchFile(config, lang);
clOptions.AddFlag("PrecompiledHeaderOutputFile", pchFile);
clOptions.AddFlag("ForcedIncludeFiles", pchHeader);
}
this->LocalGenerator->AppendCompileOptions(expandedOptions,
pchOptions);
clOptions.Parse(expandedOptions);
}
if (!options.empty()) {