From 43d143da407d60bd242aa8cc914e9bd063525fc5 Mon Sep 17 00:00:00 2001 From: Patrick Stotko Date: Sun, 11 Feb 2024 18:44:08 +0100 Subject: [PATCH] cmake: Update support for CMake 3.28 --- CMakeLists.txt | 2 +- cmake/cmake_uninstall.cmake.in | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 12d9aa54b..b913e665e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.18...3.26) +cmake_minimum_required(VERSION 3.18...3.28) message(STATUS "Configuring with CMake ${CMAKE_VERSION}") diff --git a/cmake/cmake_uninstall.cmake.in b/cmake/cmake_uninstall.cmake.in index 6680a9ada..9d9177e89 100644 --- a/cmake/cmake_uninstall.cmake.in +++ b/cmake/cmake_uninstall.cmake.in @@ -9,10 +9,9 @@ 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}") - exec_program( - "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\"" - OUTPUT_VARIABLE rm_out - RETURN_VALUE rm_retval + execute_process( + COMMAND "@CMAKE_COMMAND@" "-E" "rm" "$ENV{DESTDIR}${file}" + RESULT_VARIABLE rm_retval ) if(NOT "${rm_retval}" STREQUAL 0) message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}")