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 /Modules/Platform | |
| 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 'Modules/Platform')
| -rw-r--r-- | Modules/Platform/Generic-SDCC-C.cmake | 2 | ||||
| -rw-r--r-- | Modules/Platform/Windows-GNU.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Modules/Platform/Generic-SDCC-C.cmake b/Modules/Platform/Generic-SDCC-C.cmake index aef4abf..8f648a1 100644 --- a/Modules/Platform/Generic-SDCC-C.cmake +++ b/Modules/Platform/Generic-SDCC-C.cmake @@ -47,7 +47,7 @@ set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <FLAGS> <OBJECTS> -o <TARGET> <C # needs sdcc 2.7.0 + sddclib from cvs set(CMAKE_C_CREATE_STATIC_LIBRARY - "\"${CMAKE_COMMAND}\" -E remove <TARGET>" + "\"${CMAKE_COMMAND}\" -E rm -f <TARGET>" "<CMAKE_AR> -a <TARGET> <LINK_FLAGS> <OBJECTS> ") # not supported by sdcc diff --git a/Modules/Platform/Windows-GNU.cmake b/Modules/Platform/Windows-GNU.cmake index 71189b1..cf85367 100644 --- a/Modules/Platform/Windows-GNU.cmake +++ b/Modules/Platform/Windows-GNU.cmake @@ -124,7 +124,7 @@ macro(__windows_compiler_gnu lang) string(REPLACE "<OBJECTS>" "-Wl,--whole-archive <OBJECT_DIR>/objects.a -Wl,--no-whole-archive" CMAKE_${lang}_${rule} "${CMAKE_${lang}_${rule}}") set(CMAKE_${lang}_${rule} - "<CMAKE_COMMAND> -E remove -f <OBJECT_DIR>/objects.a" + "<CMAKE_COMMAND> -E rm -f <OBJECT_DIR>/objects.a" "<CMAKE_AR> cr <OBJECT_DIR>/objects.a <OBJECTS>" "${CMAKE_${lang}_${rule}}" ) |