mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-08 14:50:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'resolve-full-path-at-generate-time'

Browse Source 
48d1456b3d UnityBuild: Resolve full paths of unity source includes
ec2f130aa9 cmFileAPI: Resolve full path in PCH source comparison

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4029
This commit is contained in:
Brad King
2019-11-12 14:34:00 +00:00
committed by Kitware Robot
parent c96ba58a5b 48d1456b3d
commit a085648de5
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmFileAPICodemodel.cxx
View File

@@ -875,7 +875,7 @@ CompileData Target::BuildCompileData(cmSourceFile* sf)
if (!pchSource.empty() && !sf->GetProperty("SKIP_PRECOMPILE_HEADERS")) {
std::string pchOptions;
if (sf->GetFullPath() == pchSource) {
if (sf->ResolveFullPath() == pchSource) {
pchOptions =
this->GT->GetPchCreateCompileOptions(this->Config, fd.Language);
} else {

2
Source/cmLocalGenerator.cxx
View File

@@ -2486,7 +2486,7 @@ void cmLocalGenerator::AddUnityBuild(cmGeneratorTarget* target)
file << beforeInclude << "\n";
}
file << "#include \"" << sf->GetFullPath() << "\"\n";
file << "#include \"" << sf->ResolveFullPath() << "\"\n";
if (afterInclude) {
file << afterInclude << "\n";