diff options
| author | Brad King <brad.king@kitware.com> | 2020-03-18 18:22:11 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-03-24 14:10:06 (GMT) |
| commit | 25f48761faad8308f23690a51030a49d05007391 (patch) | |
| tree | 1f3ece02d09b79e7a6bab7b0fb4593323e5e66bd /Source/cmFileCommand.cxx | |
| parent | 12b39aef7599a3ab6b1c1b9537d427839a9346b3 (diff) | |
| download | CMake-25f48761faad8308f23690a51030a49d05007391.zip CMake-25f48761faad8308f23690a51030a49d05007391.tar.gz CMake-25f48761faad8308f23690a51030a49d05007391.tar.bz2 | |
Simplify absolute path conversions using CollapseFullPath full signature
Diffstat (limited to 'Source/cmFileCommand.cxx')
| -rw-r--r-- | Source/cmFileCommand.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index 8b450d0..4603b13 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -2327,12 +2327,9 @@ bool HandleLockCommand(std::vector<std::string> const& args, path += "/cmake.lock"; } - if (!cmsys::SystemTools::FileIsFullPath(path)) { - path = status.GetMakefile().GetCurrentSourceDirectory() + "/" + path; - } - // Unify path (remove '//', '/../', ...) - path = cmSystemTools::CollapseFullPath(path); + path = cmSystemTools::CollapseFullPath( + path, status.GetMakefile().GetCurrentSourceDirectory()); // Create file and directories if needed std::string parentDir = cmSystemTools::GetParentDirectory(path); |