mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 05:40:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'pch-force-include'

Browse Source 
c5c218fa0d PCH: Append pch header file to list of forced include files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4135
This commit is contained in:
Brad King
2019-12-16 15:03:54 +00:00
committed by Kitware Robot
parent b289544810 c5c218fa0d
commit fe7626da54
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/cmVisualStudio10TargetGenerator.cxx
View File

@@ -2418,6 +2418,9 @@ void cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
clOptions.AppendFlag("DisableSpecificWarnings",
"%(DisableSpecificWarnings)");
}
if (clOptions.HasFlag("ForcedIncludeFiles")) {
clOptions.AppendFlag("ForcedIncludeFiles", "%(ForcedIncludeFiles)");
}
if (configDependentDefines) {
clOptions.AddDefines(
genexInterpreter.Evaluate(configDefines, "COMPILE_DEFINITIONS"));

2
Tests/RunCMake/VS10Project/VsPrecompileHeaders-check.cmake
View File

@@ -31,7 +31,7 @@ foreach(line IN LISTS tgt_projects_strings)
set(have_pch_header ON)
endif()
if (line MATCHES "<ForcedIncludeFiles.*>.*${pch_header}</ForcedIncludeFiles>")
if (line MATCHES "<ForcedIncludeFiles.*>.*${pch_header}.*</ForcedIncludeFiles>")
set(have_force_pch_header ON)
endif()