cmake: restore creation of kconfig_menus.json

diff --git a/tools/ci/test_build_system_cmake.sh b/tools/ci/test_build_system_cmake.sh
index 05bdb1b7aecddbfb3aed4dbacd163d2a2781b5e0..c4290fe1d4c962b4c27aa9edbbd0d48648676576 100755 (executable)
--- a/tools/ci/test_build_system_cmake.sh
+++ b/tools/ci/test_build_system_cmake.sh
@@ -58,6 +58,7 @@ function run_tests()
     BOOTLOADER_BINS="bootloader/bootloader.elf bootloader/bootloader.bin"
     APP_BINS="app-template.elf app-template.bin"
     PARTITION_BIN="partition_table/partition-table.bin"
+    BUILD_ARTIFACTS="project_description.json flasher_args.json config/kconfig_menus.json config/sdkconfig.json"
     IDF_COMPONENT_PREFIX="__idf"
 
     print_status "Initial clean build"
@@ -65,7 +66,7 @@ function run_tests()
     idf.py build || exit $?
 
     # check all the expected build artifacts from the clean build
-    assert_built ${APP_BINS} ${BOOTLOADER_BINS} ${PARTITION_BIN}
+    assert_built ${APP_BINS} ${BOOTLOADER_BINS} ${PARTITION_BIN} ${BUILD_ARTIFACTS}
 
     print_status "Updating component source file rebuilds component"
     # touch a file & do a build

diff --git a/tools/cmake/kconfig.cmake b/tools/cmake/kconfig.cmake
index 6846ba6fdc81b98901af1ee8e373178f27cc9b84..00d1aa904ea737ee9735cb68139d27292696d727 100644 (file)
--- a/tools/cmake/kconfig.cmake
+++ b/tools/cmake/kconfig.cmake
@@ -137,7 +137,7 @@ function(__kconfig_generate_config sdkconfig sdkconfig_defaults)
     set(sdkconfig_cmake ${config_dir}/sdkconfig.cmake)
     set(sdkconfig_header ${config_dir}/sdkconfig.h)
     set(sdkconfig_json ${config_dir}/sdkconfig.json)
-    set(sdkconfig_json_menus ${config_dir}/${kconfig_menus}.json)
+    set(sdkconfig_json_menus ${config_dir}/kconfig_menus.json)
 
     idf_build_get_property(output_sdkconfig __OUTPUT_SDKCONFIG)
     if(output_sdkconfig)