Merge branch 'bugfix/menuconfig_fails_on_cmake' into 'master'
Fix menuconfig fail on cmake Closes #48 See merge request idf/esp-idf!3826
This commit is contained in:
commit
56e4c6e5a3
2 changed files with 5 additions and 4 deletions
|
@ -17,8 +17,7 @@ $(2): $(1) $(LDGEN_FRAGMENT_FILES) $(SDKCONFIG) $(LDGEN_SECTIONS_INFO_FILES)
|
||||||
--kconfig $(IDF_PATH)/Kconfig \
|
--kconfig $(IDF_PATH)/Kconfig \
|
||||||
--env "COMPONENT_KCONFIGS=$(COMPONENT_KCONFIGS)" \
|
--env "COMPONENT_KCONFIGS=$(COMPONENT_KCONFIGS)" \
|
||||||
--env "COMPONENT_KCONFIGS_PROJBUILD=$(COMPONENT_KCONFIGS_PROJBUILD)" \
|
--env "COMPONENT_KCONFIGS_PROJBUILD=$(COMPONENT_KCONFIGS_PROJBUILD)" \
|
||||||
--env "IDF_CMAKE=n" \
|
--env "IDF_CMAKE=n"
|
||||||
--env "IDF_TARGET=$(IDF_TARGET)"
|
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define ldgen_create_commands
|
define ldgen_create_commands
|
||||||
|
|
|
@ -61,13 +61,14 @@ function(kconfig_process_config)
|
||||||
add_custom_target(menuconfig
|
add_custom_target(menuconfig
|
||||||
${menuconfig_depends}
|
${menuconfig_depends}
|
||||||
# create any missing config file, with defaults if necessary
|
# create any missing config file, with defaults if necessary
|
||||||
COMMAND ${confgen_basecommand} --output config ${SDKCONFIG}
|
COMMAND ${confgen_basecommand} --env "IDF_TARGET=${IDF_TARGET}" --output config ${SDKCONFIG}
|
||||||
COMMAND ${CMAKE_COMMAND} -E env
|
COMMAND ${CMAKE_COMMAND} -E env
|
||||||
"COMPONENT_KCONFIGS=${kconfigs}"
|
"COMPONENT_KCONFIGS=${kconfigs}"
|
||||||
"COMPONENT_KCONFIGS_PROJBUILD=${kconfigs_projbuild}"
|
"COMPONENT_KCONFIGS_PROJBUILD=${kconfigs_projbuild}"
|
||||||
"IDF_CMAKE=y"
|
"IDF_CMAKE=y"
|
||||||
"KCONFIG_CONFIG=${SDKCONFIG}"
|
"KCONFIG_CONFIG=${SDKCONFIG}"
|
||||||
${MCONF} ${ROOT_KCONFIG}
|
"IDF_TARGET=${IDF_TARGET}"
|
||||||
|
${CMAKE_BINARY_DIR}/${MCONF} ${ROOT_KCONFIG}
|
||||||
VERBATIM
|
VERBATIM
|
||||||
USES_TERMINAL)
|
USES_TERMINAL)
|
||||||
|
|
||||||
|
@ -157,6 +158,7 @@ if(NOT MCONF)
|
||||||
BUILD_BYPRODUCTS ${MCONF}
|
BUILD_BYPRODUCTS ${MCONF}
|
||||||
INSTALL_COMMAND ""
|
INSTALL_COMMAND ""
|
||||||
EXCLUDE_FROM_ALL 1
|
EXCLUDE_FROM_ALL 1
|
||||||
|
WORKING_DIRECTORY ${CMAKE_BINARY_DIR} # Put built files on top level build directory
|
||||||
)
|
)
|
||||||
|
|
||||||
file(GLOB mconf_srcfiles ${IDF_PATH}/tools/kconfig/*.c)
|
file(GLOB mconf_srcfiles ${IDF_PATH}/tools/kconfig/*.c)
|
||||||
|
|
Loading…
Reference in a new issue