From: Angus Gratton <angus@espressif.com>
Date: Mon, 15 Apr 2019 03:46:50 +0000 (+1000)
Subject: cmake: Fix menuconfig target
X-Git-Tag: v4.0-beta1~329^2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3cf56ea6b6c25cb20bfafa3497a7c19f5154e320;p=esp-idf

cmake: Fix menuconfig target

need to load mconf path as build property
---

diff --git a/tools/cmake/kconfig.cmake b/tools/cmake/kconfig.cmake
index 813363a931..6846ba6fdc 100644
--- a/tools/cmake/kconfig.cmake
+++ b/tools/cmake/kconfig.cmake
@@ -188,6 +188,8 @@ function(__kconfig_generate_config sdkconfig sdkconfig_defaults)
 
     idf_build_get_property(menuconfig_depends __MENUCONFIG_DEPENDS)
 
+    idf_build_get_property(mconf __MCONF)
+
     # Generate the menuconfig target (uses C-based mconf-idf tool, either prebuilt or via mconf-idf target above)
     add_custom_target(menuconfig
         ${menuconfig_depends}
@@ -198,7 +200,7 @@ function(__kconfig_generate_config sdkconfig sdkconfig_defaults)
         "COMPONENT_KCONFIGS_PROJBUILD=${kconfig_projbuilds}"
         "IDF_CMAKE=y"
         "KCONFIG_CONFIG=${sdkconfig}"
-        ${MCONF} ${root_kconfig}
+        ${mconf} ${root_kconfig}
         VERBATIM
         USES_TERMINAL
         # additional run of confgen esures that the deprecated options will be inserted into sdkconfig (for backward