mirror of
https://github.com/espressif/esp-idf.git
synced 2026-10-03 03:31:41 +03:00
Merge branch 'task/remove_build_components_var_in_buildv2' into 'master'
change(build): drop BUILD_COMPONENTS support and migrate test_apps to not use it for buildv2 Closes IDF-15859 See merge request espressif/esp-idf!51695
This commit is contained in:
@@ -70,7 +70,12 @@ set(expected_components
|
||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -nostdlib")
|
||||
|
||||
# Get all the components that were required to initialize this project
|
||||
idf_build_get_property(build_components BUILD_COMPONENTS)
|
||||
if(IDF_BUILD_V2)
|
||||
get_target_property(library ${project_elf} LIBRARY_INTERFACE)
|
||||
idf_library_get_property(build_components "${library}" LIBRARY_COMPONENTS_LINKED)
|
||||
else()
|
||||
idf_build_get_property(build_components BUILD_COMPONENTS)
|
||||
endif()
|
||||
|
||||
# Sort lists to be able to compare them literally
|
||||
list(SORT expected_components)
|
||||
|
||||
@@ -126,7 +126,12 @@ set(expected_components
|
||||
list(SORT expected_components)
|
||||
|
||||
|
||||
idf_build_get_property(build_components BUILD_COMPONENTS)
|
||||
if(IDF_BUILD_V2)
|
||||
get_target_property(library ${project_elf} LIBRARY_INTERFACE)
|
||||
idf_library_get_property(build_components "${library}" LIBRARY_COMPONENTS_LINKED)
|
||||
else()
|
||||
idf_build_get_property(build_components BUILD_COMPONENTS)
|
||||
endif()
|
||||
list(SORT build_components)
|
||||
|
||||
if(NOT "${expected_components}" STREQUAL "${build_components}")
|
||||
|
||||
@@ -64,7 +64,6 @@ expected_dep_violations = {
|
||||
# dependency graph captures edges that target_link_libraries creates at link
|
||||
# time but were never recorded as requires.
|
||||
if os.environ.get('IDF_BUILD_V2'):
|
||||
expected_dep_violations.setdefault('esp_common', []).extend(['efuse', 'bootloader_support', 'app_update'])
|
||||
expected_dep_violations['esp_system'].append('esp_app_format')
|
||||
|
||||
# Target-specific expected dependency violations
|
||||
|
||||
Reference in New Issue
Block a user