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

48d1456b UnityBuild: Resolve full paths of unity source includes
ec2f130a cmFileAPI: Resolve full path in PCH source comparison
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4029

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 {

Source/cmLocalGenerator.cxx

@@ -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";