From ec2f130aa9bf97860789c524c0b9902856e4bf18 Mon Sep 17 00:00:00 2001 From: Daniel Eiband Date: Mon, 11 Nov 2019 13:03:29 +0100 Subject: cmFileAPI: Resolve full path in PCH source comparison Issue: 19927 --- Source/cmFileAPICodemodel.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/cmFileAPICodemodel.cxx b/Source/cmFileAPICodemodel.cxx index 48561de..a12b3c9 100644 --- a/Source/cmFileAPICodemodel.cxx +++ b/Source/cmFileAPICodemodel.cxx @@ -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 { -- cgit v0.12 From 48d1456b3d2f180acb3afba26a480f3b72fd3ddd Mon Sep 17 00:00:00 2001 From: Daniel Eiband Date: Mon, 11 Nov 2019 13:05:31 +0100 Subject: UnityBuild: Resolve full paths of unity source includes Issue: 19927 --- Source/cmLocalGenerator.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 00bd8af..e200894 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -2488,7 +2488,7 @@ void cmLocalGenerator::AddUnityBuild(cmGeneratorTarget* target) file << beforeInclude << "\n"; } - file << "#include \"" << sf->GetFullPath() << "\"\n"; + file << "#include \"" << sf->ResolveFullPath() << "\"\n"; if (afterInclude) { file << afterInclude << "\n"; -- cgit v0.12