From 96994b82bb6087ebba9eb0b32ec7e5b1e522778d Mon Sep 17 00:00:00 2001 From: Peter van der Perk Date: Wed, 6 Oct 2021 11:16:27 +0200 Subject: [PATCH] Kconfig cmake change rm to remove to remain compatible with CMake older then 3.17 --- cmake/kconfig.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/kconfig.cmake b/cmake/kconfig.cmake index 8645cda39a..ffd0a99d64 100644 --- a/cmake/kconfig.cmake +++ b/cmake/kconfig.cmake @@ -346,7 +346,7 @@ if(${LABEL} MATCHES "default" OR ${LABEL} MATCHES "bootloader" OR ${LABEL} MATCH ${MENUCONFIG_PATH} Kconfig COMMAND ${CMAKE_COMMAND} -E env ${COMMON_KCONFIG_ENV_SETTINGS} ${SAVEDEFCONFIG_PATH} COMMAND ${CMAKE_COMMAND} -E copy defconfig ${BOARD_DEFCONFIG} - COMMAND ${CMAKE_COMMAND} -E rm ${PX4_BINARY_DIR}/NuttX/apps_copy.stamp + COMMAND ${CMAKE_COMMAND} -E remove ${PX4_BINARY_DIR}/NuttX/apps_copy.stamp WORKING_DIRECTORY ${PX4_SOURCE_DIR} USES_TERMINAL COMMAND_EXPAND_LISTS @@ -358,7 +358,7 @@ if(${LABEL} MATCHES "default" OR ${LABEL} MATCHES "bootloader" OR ${LABEL} MATCH ${GUICONFIG_PATH} Kconfig COMMAND ${CMAKE_COMMAND} -E env ${COMMON_KCONFIG_ENV_SETTINGS} ${SAVEDEFCONFIG_PATH} COMMAND ${CMAKE_COMMAND} -E copy defconfig ${BOARD_DEFCONFIG} - COMMAND ${CMAKE_COMMAND} -E rm ${PX4_BINARY_DIR}/NuttX/apps_copy.stamp + COMMAND ${CMAKE_COMMAND} -E remove ${PX4_BINARY_DIR}/NuttX/apps_copy.stamp WORKING_DIRECTORY ${PX4_SOURCE_DIR} USES_TERMINAL COMMAND_EXPAND_LISTS @@ -370,7 +370,7 @@ else() ${MENUCONFIG_PATH} Kconfig COMMAND ${CMAKE_COMMAND} -E env ${COMMON_KCONFIG_ENV_SETTINGS} ${SAVEDEFCONFIG_PATH} COMMAND ${CMAKE_COMMAND} -E env ${COMMON_KCONFIG_ENV_SETTINGS} ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/kconfig/diffconfig.py -m ${PX4_BOARD_DIR}/default.px4board defconfig > ${BOARD_DEFCONFIG} - COMMAND ${CMAKE_COMMAND} -E rm ${PX4_BINARY_DIR}/NuttX/apps_copy.stamp + COMMAND ${CMAKE_COMMAND} -E remove ${PX4_BINARY_DIR}/NuttX/apps_copy.stamp WORKING_DIRECTORY ${PX4_SOURCE_DIR} USES_TERMINAL COMMAND_EXPAND_LISTS @@ -382,7 +382,7 @@ else() ${GUICONFIG_PATH} Kconfig COMMAND ${CMAKE_COMMAND} -E env ${COMMON_KCONFIG_ENV_SETTINGS} ${SAVEDEFCONFIG_PATH} COMMAND ${CMAKE_COMMAND} -E env ${COMMON_KCONFIG_ENV_SETTINGS} ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/kconfig/diffconfig.py -m ${PX4_BOARD_DIR}/default.px4board defconfig > ${BOARD_DEFCONFIG} - COMMAND ${CMAKE_COMMAND} -E rm ${PX4_BINARY_DIR}/NuttX/apps_copy.stamp + COMMAND ${CMAKE_COMMAND} -E remove ${PX4_BINARY_DIR}/NuttX/apps_copy.stamp WORKING_DIRECTORY ${PX4_SOURCE_DIR} USES_TERMINAL COMMAND_EXPAND_LISTS