diff options
| author | Craig Scott <craig.scott@crascit.com> | 2021-01-29 13:57:24 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-01-29 13:57:33 (GMT) |
| commit | 525363447ff68281e0d000391877069b490b1516 (patch) | |
| tree | 5446db4143965f87f87705f8ec360d3443fbf508 /Source | |
| parent | 36bb0e32d7e3976eed424078cf5cac459651f0f1 (diff) | |
| parent | 76cea3dfe2b968885f8a956504bcee9d46a58303 (diff) | |
| download | CMake-525363447ff68281e0d000391877069b490b1516.zip CMake-525363447ff68281e0d000391877069b490b1516.tar.gz CMake-525363447ff68281e0d000391877069b490b1516.tar.bz2 | |
Merge topic 'cmake_path-stabilization'
76cea3dfe2 cmake_path: rename 'GET ... RELATIVE_PATH' to 'GET ... RELATIVE_PART'
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5743
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmCMakePathCommand.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmCMakePathCommand.cxx b/Source/cmCMakePathCommand.cxx index e14dce0..962fdcc 100644 --- a/Source/cmCMakePathCommand.cxx +++ b/Source/cmCMakePathCommand.cxx @@ -194,7 +194,7 @@ bool HandleGetCommand(std::vector<std::string> const& args, } return path.GetNarrowStem(); } }, - { "RELATIVE_PATH"_s, + { "RELATIVE_PART"_s, [](const cmCMakePath& path, bool) -> cmCMakePath { return path.GetRelativePath(); } }, @@ -817,7 +817,7 @@ bool HandleHasStemCommand(std::vector<std::string> const& args, [](const cmCMakePath& path) -> bool { return path.HasStem(); }); } -bool HandleHasRelativePathCommand(std::vector<std::string> const& args, +bool HandleHasRelativePartCommand(std::vector<std::string> const& args, cmExecutionStatus& status) { return HandleHasItemCommand( @@ -986,7 +986,7 @@ bool cmCMakePathCommand(std::vector<std::string> const& args, { "HAS_FILENAME"_s, HandleHasFilenameCommand }, { "HAS_EXTENSION"_s, HandleHasExtensionCommand }, { "HAS_STEM"_s, HandleHasStemCommand }, - { "HAS_RELATIVE_PATH"_s, HandleHasRelativePathCommand }, + { "HAS_RELATIVE_PART"_s, HandleHasRelativePartCommand }, { "HAS_PARENT_PATH"_s, HandleHasParentPathCommand }, { "IS_ABSOLUTE"_s, HandleIsAbsoluteCommand }, { "IS_RELATIVE"_s, HandleIsRelativeCommand }, |