cmake: Fix menuconfig target

need to load mconf path as build property
This commit is contained in:
Angus Gratton 2019-04-15 13:46:50 +10:00 committed by Renz Christian Bagaporo
parent c6dc47b3e2
commit 3cf56ea6b6

View File

@ -188,6 +188,8 @@ function(__kconfig_generate_config sdkconfig sdkconfig_defaults)
idf_build_get_property(menuconfig_depends __MENUCONFIG_DEPENDS) 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) # Generate the menuconfig target (uses C-based mconf-idf tool, either prebuilt or via mconf-idf target above)
add_custom_target(menuconfig add_custom_target(menuconfig
${menuconfig_depends} ${menuconfig_depends}
@ -198,7 +200,7 @@ function(__kconfig_generate_config sdkconfig sdkconfig_defaults)
"COMPONENT_KCONFIGS_PROJBUILD=${kconfig_projbuilds}" "COMPONENT_KCONFIGS_PROJBUILD=${kconfig_projbuilds}"
"IDF_CMAKE=y" "IDF_CMAKE=y"
"KCONFIG_CONFIG=${sdkconfig}" "KCONFIG_CONFIG=${sdkconfig}"
${MCONF} ${root_kconfig} ${mconf} ${root_kconfig}
VERBATIM VERBATIM
USES_TERMINAL USES_TERMINAL
# additional run of confgen esures that the deprecated options will be inserted into sdkconfig (for backward # additional run of confgen esures that the deprecated options will be inserted into sdkconfig (for backward