mirror of
https://github.com/espressif/esp-idf.git
synced 2026-04-27 19:13:21 +00:00
fix(cmakev2/kconfig): add public aliases for sdkconfig output properties
The cmakev2 kconfig module sets sdkconfig output paths using internal property names (__SDKCONFIG_HEADER, __SDKCONFIG_CMAKE, etc.), but components like ULP read the public names (SDKCONFIG_HEADER, SDKCONFIG_CMAKE). This results in empty values being passed to the ULP sub-project, causing its CMake configure step to fail. Add public aliases matching the cmake v1 property names for backward compatibility. Signed-off-by: Frantisek Hrbata <frantisek.hrbata@espressif.com>
This commit is contained in:
@@ -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()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user