diff options
| author | Brad King <brad.king@kitware.com> | 2019-11-12 14:34:00 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-11-12 14:34:11 (GMT) |
| commit | 7a08f0d8dd7c4337c397b1227c2d3792c2a21215 (patch) | |
| tree | 30584728075a243f4f959b4d585e5dd71740e352 | |
| parent | cba091d3a900d69961ef94a475c3ba1b0cb94453 (diff) | |
| parent | 48d1456b3d2f180acb3afba26a480f3b72fd3ddd (diff) | |
| download | CMake-7a08f0d8dd7c4337c397b1227c2d3792c2a21215.zip CMake-7a08f0d8dd7c4337c397b1227c2d3792c2a21215.tar.gz CMake-7a08f0d8dd7c4337c397b1227c2d3792c2a21215.tar.bz2 | |
Merge topic 'resolve-full-path-at-generate-time' into release-3.16
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
| -rw-r--r-- | Source/cmFileAPICodemodel.cxx | 2 | ||||
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
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 { diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 6a9cb23..827f55a 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -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"; |