Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-31 18:47:21 +08:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Kconfig remove clean use configure depends and apps timestamp instead

Browse Source
This commit is contained in:
Peter van der Perk
2021-08-03 19:12:46 +02:00
committed by Daniel Agar
parent abd85cd219
commit 7aa28ba9cd
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/kconfig.cmake
+5 -4
View File
@@ -30,8 +30,7 @@ add_custom_target(boardconfig
${MENUCONFIG_PATH} Kconfig ${MENUCONFIG_PATH} Kconfig
COMMAND ${CMAKE_COMMAND} -E env ${COMMON_KCONFIG_ENV_SETTINGS} ${SAVEDEFCONFIG_PATH} COMMAND ${CMAKE_COMMAND} -E env ${COMMON_KCONFIG_ENV_SETTINGS} ${SAVEDEFCONFIG_PATH}
COMMAND ${CMAKE_COMMAND} -E copy defconfig ${BOARD_DEFCONFIG} COMMAND ${CMAKE_COMMAND} -E copy defconfig ${BOARD_DEFCONFIG}
COMMENT "Reconfiguring ${PX4_BINARY_DIR}" COMMAND ${CMAKE_COMMAND} -E rm ${PX4_BINARY_DIR}/NuttX/apps_copy.stamp
COMMAND ${CMAKE_COMMAND} -E env make clean ${PX4_BINARY_DIR}
WORKING_DIRECTORY ${PX4_SOURCE_DIR} WORKING_DIRECTORY ${PX4_SOURCE_DIR}
USES_TERMINAL USES_TERMINAL
COMMAND_EXPAND_LISTS COMMAND_EXPAND_LISTS
@@ -43,8 +42,7 @@ add_custom_target(boardguiconfig
${GUICONFIG_PATH} Kconfig ${GUICONFIG_PATH} Kconfig
COMMAND ${CMAKE_COMMAND} -E env ${COMMON_KCONFIG_ENV_SETTINGS} ${SAVEDEFCONFIG_PATH} COMMAND ${CMAKE_COMMAND} -E env ${COMMON_KCONFIG_ENV_SETTINGS} ${SAVEDEFCONFIG_PATH}
COMMAND ${CMAKE_COMMAND} -E copy defconfig ${BOARD_DEFCONFIG} COMMAND ${CMAKE_COMMAND} -E copy defconfig ${BOARD_DEFCONFIG}
COMMENT "Reconfiguring ${PX4_BINARY_DIR}" COMMAND ${CMAKE_COMMAND} -E rm ${PX4_BINARY_DIR}/NuttX/apps_copy.stamp
COMMAND ${CMAKE_COMMAND} -E env make clean ${PX4_BINARY_DIR}
WORKING_DIRECTORY ${PX4_SOURCE_DIR} WORKING_DIRECTORY ${PX4_SOURCE_DIR}
USES_TERMINAL USES_TERMINAL
COMMAND_EXPAND_LISTS COMMAND_EXPAND_LISTS
@@ -52,6 +50,8 @@ add_custom_target(boardguiconfig
if(EXISTS ${BOARD_DEFCONFIG}) if(EXISTS ${BOARD_DEFCONFIG})
# Depend on BOARD_DEFCONFIG so that we reconfigure on config change
set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${BOARD_DEFCONFIG})
# Generate boardconfig from saved defconfig # Generate boardconfig from saved defconfig
execute_process(COMMAND ${CMAKE_COMMAND} -E env ${COMMON_KCONFIG_ENV_SETTINGS} execute_process(COMMAND ${CMAKE_COMMAND} -E env ${COMMON_KCONFIG_ENV_SETTINGS}
@@ -59,6 +59,7 @@ if(EXISTS ${BOARD_DEFCONFIG})
WORKING_DIRECTORY ${PX4_SOURCE_DIR} WORKING_DIRECTORY ${PX4_SOURCE_DIR}
OUTPUT_VARIABLE DUMMY_RESULTS) OUTPUT_VARIABLE DUMMY_RESULTS)
# parse board config options for cmake # parse board config options for cmake
file(STRINGS ${BOARD_CONFIG} ConfigContents) file(STRINGS ${BOARD_CONFIG} ConfigContents)
foreach(NameAndValue ${ConfigContents}) foreach(NameAndValue ${ConfigContents})