From da2e58893524414a84cde576a472293c4641fe8a Mon Sep 17 00:00:00 2001 From: Bartosz Kosiorek Date: Tue, 12 Mar 2019 14:20:53 +0100 Subject: cmake: Upgrade 'cmake -E' commands description Fixes: #13204 --- Help/manual/cmake.1.rst | 16 ++++++++++++---- Source/cmcmd.cxx | 4 ++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst index e9a08b5..c5a3c88 100644 --- a/Help/manual/cmake.1.rst +++ b/Help/manual/cmake.1.rst @@ -390,16 +390,20 @@ Available commands are: Copy files to ```` (either file or directory). If multiple files are specified, the ```` must be directory and it must exist. Wildcards are not supported. + ``copy`` does follow symlinks. That means it does not copy symlinks, + but the files or directories it point to. ``copy_directory ... `` Copy directories to ```` directory. If ```` directory does not exist it will be created. + ``copy_directory`` does follow symlinks. ``copy_if_different ... `` Copy files to ```` (either file or directory) if they have changed. If multiple files are specified, the ```` must be directory and it must exist. + ``copy_if_different`` does follow symlinks. ``echo [...]`` Displays arguments as text. @@ -459,13 +463,16 @@ Available commands are: exist, the command returns a non-zero exit code, but no message is logged. The ``-f`` option changes the behavior to return a zero exit code (i.e. success) in such situations instead. + ``remove`` does not follow symlinks. That means it remove only symlinks + and not files it point to. ``remove_directory `` Remove a directory and its contents. If a directory does not exist it will be silently ignored. ``rename `` - Rename a file or directory (on one volume). + Rename a file or directory (on one volume). If file with the ```` name + already exists, then it will be silently replaced. ``server`` Launch :manual:`cmake-server(7)` mode. @@ -494,10 +501,11 @@ Available commands are: ``time [...]`` Run command and display elapsed time. -``touch `` - Touch a file. +``touch ...`` + Creates ```` if file do not exist. + If ```` exists, it is changing ```` access and modification times. -``touch_nocreate `` +``touch_nocreate ...`` Touch a file if it exists but do not create it. If a file does not exist it will be silently ignored. diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx index cefac7a..f996a3e 100644 --- a/Source/cmcmd.cxx +++ b/Source/cmcmd.cxx @@ -111,8 +111,8 @@ void CMakeCommandUsage(const char* program) << " tar [cxt][vf][zjJ] file.tar [file/dir1 file/dir2 ...]\n" << " - create or extract a tar or zip archive\n" << " time command [args...] - run command and display elapsed time\n" - << " touch file - touch a file.\n" - << " touch_nocreate file - touch a file but do not create it.\n" + << " touch ... - touch a .\n" + << " touch_nocreate ... - touch a but do not create it.\n" << " create_symlink old new - create a symbolic link new -> old\n" #if defined(_WIN32) && !defined(__CYGWIN__) << "Available on Windows only:\n" -- cgit v0.12