6d008352c6
Viktor Szakats
2026-06-26
Subject
cmake: replace deprecated `remove` command with `rm` and pass arg safely
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
.github/workflows/linux.yml +7 -1CMake/cmake_uninstall.in.cmake +2 -10tests/certs/CMakeLists.txt +1 -1
.github/workflows/linux.yml+7 -1
| @@ -79,7 +79,7 @@ jobs: | |
| - name: 'awslc' | |
| install_packages: libidn2-dev | |
| - | install_steps: awslc |
| + | install_steps: awslc clean |
| generate: -DOPENSSL_ROOT_DIR=/home/runner/awslc -DUSE_ECH=ON -DCMAKE_UNITY_BUILD=OFF -DCURL_DROP_UNUSED=ON -DCURL_PATCHSTAMP=test-patch -DCURL_ENABLE_NTLM=ON | |
| - name: 'boringssl' | |
| @@ -916,6 +916,9 @@ jobs: | |
| run: | | |
| if [ "${MATRIX_BUILD}" = 'cmake' ]; then | |
| cmake --install bld --strip | |
| + | if [[ "${MATRIX_INSTALL_STEPS}" = *'clean'* ]]; then |
| + | cmake --build bld --target curl_uninstall |
| + | fi |
| else | |
| make -C bld V=1 install | |
| fi | |
| @@ -962,6 +965,9 @@ jobs: | |
| fi | |
| if [ "${MATRIX_BUILD}" = 'cmake' ]; then | |
| cmake --build bld --verbose --target "${TEST_TARGET}" | |
| + | if [[ "${MATRIX_INSTALL_STEPS}" = *'clean'* ]]; then |
| + | cmake --build bld --target clean-certs |
| + | fi |
| else | |
| make -C bld V=1 "${TEST_TARGET}" | |
| fi | |
CMake/cmake_uninstall.in.cmake+2 -10
| @@ -35,16 +35,8 @@ string(REGEX REPLACE "\n" ";" _files "${_files}") | |
| foreach(_file ${_files}) | |
| message(STATUS "Uninstalling $ENV{DESTDIR}${_file}") | |
| if(IS_SYMLINK "$ENV{DESTDIR}${_file}" OR EXISTS "$ENV{DESTDIR}${_file}") | |
| - | execute_process( |
| - | COMMAND "@CMAKE_COMMAND@" -E remove "$ENV{DESTDIR}${_file}" |
| - | RESULT_VARIABLE rm_retval |
| - | OUTPUT_QUIET |
| - | ERROR_QUIET |
| - | ) |
| - | if(NOT "${rm_retval}" STREQUAL 0) |
| - | message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${_file}") |
| - | endif() |
| + | execute_process(COMMAND "@CMAKE_COMMAND@" -E rm -f -- "$ENV{DESTDIR}${_file}") |
| else() | |
| - | message(STATUS "File $ENV{DESTDIR}${_file} does not exist.") |
| + | message(STATUS "File does not exist: $ENV{DESTDIR}${_file}") |
| endif() | |
| endforeach() | |
tests/certs/CMakeLists.txt+1 -1
| @@ -39,7 +39,7 @@ if(NOT _CURL_SKIP_BUILD_CERTS) | |
| endif() | |
| add_custom_target(clean-certs | |
| - | COMMAND ${CMAKE_COMMAND} -E remove ${GENERATEDCERTS} |
| + | COMMAND ${CMAKE_COMMAND} -E rm -f ${GENERATEDCERTS} |
| "test-*.csr" | |
| "test-*.der" | |
| "test-*.keyenc" | |