espressif/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-04-27 19:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/cmakev2_ulp_fixes' into 'master'

Browse Source 
fix(cmakev2): allow building ULP apps with cmakev2

Closes IDF-15435

See merge request espressif/esp-idf!46470
This commit is contained in:
Frantisek Hrbata
2026-03-13 11:39:57 +01:00
parent 4bb6ab870c f46b26fa47
commit e494fb6284
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/cmakev2/kconfig.cmake
+7 -1
View File
@@ -656,12 +656,18 @@ function(__generate_kconfig_outputs)
set_property(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" APPEND PROPERTY
ADDITIONAL_CLEAN_FILES "${sdkconfig_header}" "${sdkconfig_cmake}")
# Store output paths in build properties
# Store output paths in build properties (internal)
idf_build_set_property(__SDKCONFIG_HEADER "${sdkconfig_header}")
idf_build_set_property(__SDKCONFIG_CMAKE "${sdkconfig_cmake}")
idf_build_set_property(__SDKCONFIG_JSON "${sdkconfig_json}")
idf_build_set_property(__SDKCONFIG_JSON_MENUS "${sdkconfig_json_menus}")
# Public aliases for backward compatibility with components (e.g. ULP)
idf_build_set_property(SDKCONFIG_HEADER "${sdkconfig_header}")
idf_build_set_property(SDKCONFIG_CMAKE "${sdkconfig_cmake}")
idf_build_set_property(SDKCONFIG_JSON "${sdkconfig_json}")
idf_build_set_property(SDKCONFIG_JSON_MENUS "${sdkconfig_json_menus}")
idf_msg("Generated Kconfig outputs in ${config_dir}")
endfunction()
tools/cmakev2/project.cmake
+9
View File
@@ -604,6 +604,15 @@ macro(idf_project_init)
# Ensure this is done after including the sdkconfig.
__init_idf_target_arch()
# Make build properties available as CMake variables for backward
# compatibility with project_include.cmake files (e.g. ULP component
# references ${SDKCONFIG_HEADER} and ${SDKCONFIG_CMAKE} directly).
idf_build_get_property(build_properties BUILD_PROPERTIES)
foreach(build_property IN LISTS build_properties)
idf_build_get_property(val ${build_property})
set(${build_property} "${val}")
endforeach()
# Include all project_include.cmake files for the components that have
# been discovered.
idf_build_get_property(component_interfaces COMPONENT_INTERFACES)