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/cmSetPropertyCommand.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/cmSetPropertyCommand.cxx')
| -rw-r--r-- | Source/cmSetPropertyCommand.cxx | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/Source/cmSetPropertyCommand.cxx b/Source/cmSetPropertyCommand.cxx index e7330ef..4dbbbd7 100644 --- a/Source/cmSetPropertyCommand.cxx +++ b/Source/cmSetPropertyCommand.cxx @@ -235,14 +235,8 @@ bool HandleDirectoryMode(cmExecutionStatus& status, if (!names.empty()) { // Construct the directory name. Interpret relative paths with // respect to the current directory. - std::string dir = *names.begin(); - if (!cmSystemTools::FileIsFullPath(dir)) { - dir = cmStrCat(status.GetMakefile().GetCurrentSourceDirectory(), '/', - *names.begin()); - } - - // The local generators are associated with collapsed paths. - dir = cmSystemTools::CollapseFullPath(dir); + std::string dir = cmSystemTools::CollapseFullPath( + *names.begin(), status.GetMakefile().GetCurrentSourceDirectory()); mf = status.GetMakefile().GetGlobalGenerator()->FindMakefile(dir); if (!mf) { |