fixup! cmake: add ExternalNcsVariantProject_Add() function

nordicjm · Oct 24, 2023 · e0a22f6 · e0a22f6
1 parent 9fdd7fe
commit e0a22f6
Showing 1 changed file with 2 additions and 12 deletions.
diff --git 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()