Commit 7a08f0d8 authored by Brad King's avatar Brad King Committed by Kitware Robot

Merge topic 'resolve-full-path-at-generate-time' into release-3.16

48d1456b UnityBuild: Resolve full paths of unity source includes
ec2f130a cmFileAPI: Resolve full path in PCH source comparison
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !4029
parents cba091d3 48d1456b
......@@ -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 {
......
......@@ -2487,7 +2487,7 @@ void cmLocalGenerator::AddUnityBuild(cmGeneratorTarget* target)
file << beforeInclude << "\n";
}
file << "#include \"" << sf->GetFullPath() << "\"\n";
file << "#include \"" << sf->ResolveFullPath() << "\"\n";
if (afterInclude) {
file << afterInclude << "\n";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment