diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2019-11-15 14:57:38 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-11-15 14:57:56 (GMT) |
| commit | 5695b0464b411746b207da2ee23b8e2d9f8ffec2 (patch) | |
| tree | 82e1a00666f6e8a026b7af578801b9b38d8e04ce /Utilities | |
| parent | 1d78e1a966912d35e1dea0e986bc0b977141e880 (diff) | |
| parent | 2d0100fac7a51327ce8053b4ab2277aaa96c12a5 (diff) | |
| download | CMake-5695b0464b411746b207da2ee23b8e2d9f8ffec2.zip CMake-5695b0464b411746b207da2ee23b8e2d9f8ffec2.tar.gz CMake-5695b0464b411746b207da2ee23b8e2d9f8ffec2.tar.bz2 | |
Merge topic 'cmake-e-rm'
2d0100fac7 replace remove and remove_directory with rm in tests
5239fc5c75 cmake -E: Add rm with improved semantics over remove and remove_directory
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3949
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Utilities/cmcurl/CMake/cmake_uninstall.cmake.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt index 0564540..22a3d5a 100644 --- a/Utilities/CMakeLists.txt +++ b/Utilities/CMakeLists.txt @@ -13,7 +13,7 @@ if(CMAKE_DOC_TARBALL) endif() add_custom_command( OUTPUT ${dir}.stamp - COMMAND cmake -E remove_directory ${dir} + COMMAND cmake -E rm -rf ${dir} COMMAND cmake -E tar xf ${CMAKE_DOC_TARBALL} COMMAND cmake -E touch ${dir}.stamp DEPENDS ${CMAKE_DOC_TARBALL} diff --git a/Utilities/cmcurl/CMake/cmake_uninstall.cmake.in b/Utilities/cmcurl/CMake/cmake_uninstall.cmake.in index db8e536..5178fd8 100644 --- a/Utilities/cmcurl/CMake/cmake_uninstall.cmake.in +++ b/Utilities/cmcurl/CMake/cmake_uninstall.cmake.in @@ -13,7 +13,7 @@ foreach(file ${files}) message(STATUS "Uninstalling $ENV{DESTDIR}${file}") if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}") exec_program( - "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\"" + "@CMAKE_COMMAND@" ARGS "-E rm -f \"$ENV{DESTDIR}${file}\"" OUTPUT_VARIABLE rm_out RETURN_VALUE rm_retval ) |