From e0a22f681c982ae3b4d92f0f7952f4c1bf1f1a1f Mon Sep 17 00:00:00 2001 From: Torsten Rasmussen Date: Tue, 24 Oct 2023 14:42:24 +0200 Subject: [PATCH] fixup! cmake: add ExternalNcsVariantProject_Add() function --- .../sysbuild/modules/ncs_sysbuild_extensions.cmake | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/cmake/sysbuild/modules/ncs_sysbuild_extensions.cmake b/cmake/sysbuild/modules/ncs_sysbuild_extensions.cmake index 3db4ecdd9b74..68c2f9987892 100644 --- a/cmake/sysbuild/modules/ncs_sysbuild_extensions.cmake +++ b/cmake/sysbuild/modules/ncs_sysbuild_extensions.cmake @@ -38,18 +38,8 @@ function(ExternalNcsVariantProject_Add) endforeach() ExternalProject_Get_Property(${VBUILD_VARIANT} BINARY_DIR) - ExternalProject_Add_Step(${VBUILD_VARIANT} variant_config - COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${${VBUILD_APPLICATION}_BINARY_DIR}/zephyr/.config - ${BINARY_DIR}/zephyr/.config - DEPENDERS build - ALWAYS True - ) - - # Disable menuconfig and friends in variant builds by substitution with a - # dummy target that does nothing except returning successfully. set_property(TARGET ${VBUILD_VARIANT} APPEND PROPERTY _EP_CMAKE_ARGS - -DKCONFIG_TARGETS=variant_config - "-DEXTRA_KCONFIG_TARGET_COMMAND_FOR_variant_config=-c\;''" + -DCONFIG_NCS_IS_VARIANT_IMAGE=y + -DPRELOAD_BINARY_DIR=${${VBUILD_APPLICATION}_BINARY_DIR} ) endfunction()