]> granicus.if.org Git - esp-idf/commitdiff
cmake: Fix menuconfig target
authorAngus Gratton <angus@espressif.com>
Mon, 15 Apr 2019 03:46:50 +0000 (13:46 +1000)
committerRenz Christian Bagaporo <renz@espressif.com>
Mon, 13 May 2019 11:57:39 +0000 (19:57 +0800)
need to load mconf path as build property

tools/cmake/kconfig.cmake

index 813363a931efb2413c058d534df00953c7936810..6846ba6fdc81b98901af1ee8e373178f27cc9b84 100644 (file)
@@ -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