Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'feature/use_new_component_registration_apis' into 'master'

Browse source 
Use new component registration API

See merge request idf/esp-idf!4898
This commit is contained in:
Angus Gratton 2019-06-25 10:24:11 +08:00
commit 9a412d3a08
272 changed files with 1473 additions and 2024 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
components/app_trace/CMakeLists.txt
View file

@ -1,16 +1,19 @@
set(COMPONENT_SRCS "app_trace.c" set(srcs
"app_trace.c"
"app_trace_util.c" "app_trace_util.c"
"host_file_io.c" "host_file_io.c"
"gcov/gcov_rtio.c") "gcov/gcov_rtio.c")
set(COMPONENT_ADD_INCLUDEDIRS "include")
set(include_dirs "include")
if(CONFIG_SYSVIEW_ENABLE) if(CONFIG_SYSVIEW_ENABLE)
list(APPEND COMPONENT_ADD_INCLUDEDIRS list(APPEND include_dirs
sys_view/Config sys_view/Config
sys_view/SEGGER sys_view/SEGGER
sys_view/Sample/OS) sys_view/Sample/OS)
list(APPEND COMPONENT_SRCS "sys_view/SEGGER/SEGGER_SYSVIEW.c" list(APPEND srcs
"sys_view/SEGGER/SEGGER_SYSVIEW.c"
"sys_view/Sample/Config/SEGGER_SYSVIEW_Config_FreeRTOS.c" "sys_view/Sample/Config/SEGGER_SYSVIEW_Config_FreeRTOS.c"
"sys_view/Sample/OS/SEGGER_SYSVIEW_FreeRTOS.c" "sys_view/Sample/OS/SEGGER_SYSVIEW_FreeRTOS.c"
"sys_view/esp32/SEGGER_RTT_esp32.c" "sys_view/esp32/SEGGER_RTT_esp32.c"
@ -19,14 +22,13 @@ if(CONFIG_SYSVIEW_ENABLE)
endif() endif()
if(CONFIG_HEAP_TRACING_TOHOST) if(CONFIG_HEAP_TRACING_TOHOST)
list(APPEND COMPONENT_SRCS "heap_trace_tohost.c") list(APPEND srcs "heap_trace_tohost.c")
endif() endif()
set(COMPONENT_REQUIRES) idf_component_register(SRCS "${srcs}"
set(COMPONENT_PRIV_REQUIRES heap soc) INCLUDE_DIRS "${include_dirs}"
set(COMPONENT_ADD_LDFRAGMENTS linker.lf) PRIV_REQUIRES soc
LDFRAGMENTS linker.lf)
register_component()
# disable --coverage for this component, as it is used as transport # disable --coverage for this component, as it is used as transport
# for gcov # for gcov

9
components/app_trace/test/CMakeLists.txt
View file

@ -1,6 +1,3 @@
set(COMPONENT_SRCDIRS ".") idf_component_register(SRC_DIRS "."
set(COMPONENT_ADD_INCLUDEDIRS ".") INCLUDE_DIRS "."
REQUIRES unity)
set(COMPONENT_REQUIRES unity)
register_component()

11
components/app_update/CMakeLists.txt
View file

@ -1,10 +1,7 @@
set(COMPONENT_SRCS "esp_ota_ops.c" idf_component_register(SRCS "esp_ota_ops.c"
"esp_app_desc.c") "esp_app_desc.c"
set(COMPONENT_ADD_INCLUDEDIRS "include") INCLUDE_DIRS "include"
REQUIRES spi_flash partition_table bootloader_support)
set(COMPONENT_REQUIRES spi_flash partition_table bootloader_support)
register_component()
# esp_app_desc structure is added as an undefined symbol because otherwise the # esp_app_desc structure is added as an undefined symbol because otherwise the
# linker will ignore this structure as it has no other files depending on it. # linker will ignore this structure as it has no other files depending on it.

9
components/app_update/test/CMakeLists.txt
View file

@ -1,6 +1,3 @@
set(COMPONENT_SRCDIRS ".") idf_component_register(SRC_DIRS "."
set(COMPONENT_ADD_INCLUDEDIRS ".") INCLUDE_DIRS "."
REQUIRES unity test_utils app_update bootloader_support nvs_flash)
set(COMPONENT_REQUIRES unity test_utils app_update bootloader_support nvs_flash)
register_component()

9
components/asio/CMakeLists.txt
View file

@ -1,6 +1,3 @@
set(COMPONENT_ADD_INCLUDEDIRS asio/asio/include port/include) idf_component_register(SRCS "asio/asio/src/asio.cpp"
set(COMPONENT_SRCS "asio/asio/src/asio.cpp") INCLUDE_DIRS "asio/asio/include" "port/include"
REQUIRES lwip)
set(COMPONENT_REQUIRES lwip)
register_component()

5
components/bootloader/CMakeLists.txt
View file

@ -1,4 +1,4 @@
register_component() idf_component_register()
# Do not generate flash file when building bootloader or is in early expansion of the build # Do not generate flash file when building bootloader or is in early expansion of the build
if(BOOTLOADER_BUILD) if(BOOTLOADER_BUILD)
@ -7,8 +7,7 @@ endif()
# Set values used in flash_bootloader_args.in and generate flash file # Set values used in flash_bootloader_args.in and generate flash file
# for bootloader # for bootloader
set(BOOTLOADER_OFFSET 0x1000) esptool_py_flash_project_args(bootloader 0x1000
esptool_py_flash_project_args(bootloader ${BOOTLOADER_OFFSET}
${BOOTLOADER_BUILD_DIR}/bootloader.bin ${BOOTLOADER_BUILD_DIR}/bootloader.bin
FLASH_IN_PROJECT FLASH_IN_PROJECT
FLASH_FILE_TEMPLATE flash_bootloader_args.in) FLASH_FILE_TEMPLATE flash_bootloader_args.in)

2
components/bootloader/flash_bootloader_args.in
View file

@ -1,4 +1,4 @@
--flash_mode ${ESPFLASHMODE} --flash_mode ${ESPFLASHMODE}
--flash_size ${ESPFLASHSIZE} --flash_size ${ESPFLASHSIZE}
--flash_freq ${ESPFLASHFREQ} --flash_freq ${ESPFLASHFREQ}
${BOOTLOADER_OFFSET} bootloader/bootloader.bin ${OFFSET} ${IMAGE}

5
components/bootloader/subproject/components/micro-ecc/CMakeLists.txt
View file

@ -1,4 +1,3 @@
# only compile the "micro-ecc/uECC.c" source file # only compile the "micro-ecc/uECC.c" source file
set(COMPONENT_SRCS "micro-ecc/uECC.c") idf_component_register(SRCS "micro-ecc/uECC.c"
set(COMPONENT_ADD_INCLUDEDIRS micro-ecc) INCLUDE_DIRS micro-ecc)
register_component()

6
components/bootloader/subproject/main/CMakeLists.txt
View file

@ -1,7 +1,5 @@
set(COMPONENT_SRCS "bootloader_start.c") idf_component_register(SRCS "bootloader_start.c"
set(COMPONENT_ADD_INCLUDEDIRS "") REQUIRES bootloader bootloader_support)
set(COMPONENT_REQUIRES bootloader bootloader_support)
register_component()
idf_build_get_property(target IDF_TARGET) idf_build_get_property(target IDF_TARGET)
set(scripts "${target}.bootloader.ld" set(scripts "${target}.bootloader.ld"

32
components/bootloader_support/CMakeLists.txt
View file

@ -1,4 +1,5 @@
set(COMPONENT_SRCS "src/bootloader_clock.c" set(srcs
"src/bootloader_clock.c"
"src/bootloader_common.c" "src/bootloader_common.c"
"src/bootloader_flash.c" "src/bootloader_flash.c"
"src/bootloader_random.c" "src/bootloader_random.c"
@ -8,10 +9,11 @@ set(COMPONENT_SRCS "src/bootloader_clock.c"
"src/flash_qio_mode.c") "src/flash_qio_mode.c")
if(BOOTLOADER_BUILD) if(BOOTLOADER_BUILD)
set(COMPONENT_ADD_INCLUDEDIRS "include include_bootloader") set(include_dirs "include" "include_bootloader")
set(COMPONENT_REQUIRES soc) #unfortunately the header directly uses SOC registers set(requires soc) #unfortunately the header directly uses SOC registers
set(COMPONENT_PRIV_REQUIRES micro-ecc spi_flash efuse) set(priv_requires micro-ecc spi_flash efuse)
list(APPEND COMPONENT_SRCS "src/bootloader_init.c" list(APPEND srcs
"src/bootloader_init.c"
"src/${IDF_TARGET}/bootloader_sha.c" "src/${IDF_TARGET}/bootloader_sha.c"
"src/${IDF_TARGET}/flash_encrypt.c" "src/${IDF_TARGET}/flash_encrypt.c"
"src/${IDF_TARGET}/secure_boot_signatures.c" "src/${IDF_TARGET}/secure_boot_signatures.c"
@ -45,18 +47,24 @@ if(BOOTLOADER_BUILD)
DEPENDS "${orig_secure_boot_verification_key}" DEPENDS "${orig_secure_boot_verification_key}"
VERBATIM) VERBATIM)
endif() endif()
set(COMPONENT_EMBED_FILES "${secure_boot_verification_key}") set(embed_files "${secure_boot_verification_key}")
set_property(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" set_property(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
"${secure_boot_verification_key}") "${secure_boot_verification_key}")
endif() endif()
else() else()
list(APPEND COMPONENT_SRCS "src/idf/bootloader_sha.c" list(APPEND srcs
"src/idf/bootloader_sha.c"
"src/idf/secure_boot_signatures.c") "src/idf/secure_boot_signatures.c")
set(COMPONENT_ADD_INCLUDEDIRS "include") set(include_dirs "include")
set(COMPONENT_PRIV_INCLUDEDIRS "include_bootloader") set(priv_include_dirs "include_bootloader")
set(COMPONENT_REQUIRES soc) #unfortunately the header directly uses SOC registers set(requires soc) #unfortunately the header directly uses SOC registers
set(COMPONENT_PRIV_REQUIRES spi_flash mbedtls efuse) set(priv_requires spi_flash mbedtls efuse)
endif() endif()
register_component() idf_component_register(SRCS "${srcs}"
INCLUDE_DIRS "${include_dirs}"
PRIV_INCLUDE_DIRS "${priv_include_dirs}"
REQUIRES "${requires}"
PRIV_REQUIRES "${priv_requires}"
EMBED_FILES "${embed_files}")

9
components/bootloader_support/test/CMakeLists.txt
View file

@ -1,6 +1,3 @@
set(COMPONENT_SRCDIRS ".") idf_component_register(SRC_DIRS "."
set(COMPONENT_ADD_INCLUDEDIRS ".") INCLUDE_DIRS "."
REQUIRES unity bootloader_support app_update)
set(COMPONENT_REQUIRES unity bootloader_support app_update)
register_component()

17
components/bt/CMakeLists.txt
View file

@ -1,11 +1,11 @@
if(CONFIG_BT_ENABLED) if(CONFIG_BT_ENABLED)
set(COMPONENT_SRCS "bt.c") set(srcs "bt.c")
set(COMPONENT_ADD_INCLUDEDIRS include) set(include_dirs include)
if(CONFIG_BT_BLUEDROID_ENABLED) if(CONFIG_BT_BLUEDROID_ENABLED)
list(APPEND COMPONENT_PRIV_INCLUDEDIRS list(APPEND priv_include_dirs
bluedroid/bta/include bluedroid/bta/include
bluedroid/bta/ar/include bluedroid/bta/ar/include
bluedroid/bta/av/include bluedroid/bta/av/include
@ -41,9 +41,9 @@ if(CONFIG_BT_ENABLED)
bluedroid/stack/include bluedroid/stack/include
bluedroid/common/include) bluedroid/common/include)
list(APPEND COMPONENT_ADD_INCLUDEDIRS bluedroid/api/include/api) list(APPEND include_dirs bluedroid/api/include/api)
list(APPEND COMPONENT_SRCS "bluedroid/api/esp_a2dp_api.c" list(APPEND srcs "bluedroid/api/esp_a2dp_api.c"
"bluedroid/api/esp_avrc_api.c" "bluedroid/api/esp_avrc_api.c"
"bluedroid/api/esp_blufi_api.c" "bluedroid/api/esp_blufi_api.c"
"bluedroid/api/esp_bt_device.c" "bluedroid/api/esp_bt_device.c"
@ -357,9 +357,10 @@ if (CONFIG_BLE_MESH)
endif() endif()
# requirements can't depend on config # requirements can't depend on config
set(COMPONENT_PRIV_REQUIRES nvs_flash soc) idf_component_register(SRCS "${srcs}"
INCLUDE_DIRS "${include_dirs}"
register_component() PRIV_INCLUDE_DIRS "${priv_include_dirs}"
REQUIRES nvs_flash soc)
if(CONFIG_BT_ENABLED) if(CONFIG_BT_ENABLED)
if(GCC_NOT_5_2_0) if(GCC_NOT_5_2_0)

8
components/bt/test/CMakeLists.txt
View file

@ -1,7 +1,5 @@
if(CONFIG_BT_ENABLED OR CMAKE_BUILD_EARLY_EXPANSION) if(CONFIG_BT_ENABLED OR CMAKE_BUILD_EARLY_EXPANSION)
set(COMPONENT_SRCDIRS ".") idf_component_register(SRC_DIRS "."
set(COMPONENT_ADD_INCLUDEDIRS ".") INCLUDE_DIRS "."
set(COMPONENT_REQUIRES unity nvs_flash bt) REQUIRES unity nvs_flash bt)
register_component()
endif() endif()

9
components/coap/CMakeLists.txt
View file

@ -1,6 +1,7 @@
set(COMPONENT_ADD_INCLUDEDIRS port/include port/include/coap libcoap/include libcoap/include/coap2) set(include_dirs port/include port/include/coap libcoap/include libcoap/include/coap2)
set(COMPONENT_SRCS "libcoap/src/address.c" set(srcs
"libcoap/src/address.c"
"libcoap/src/async.c" "libcoap/src/async.c"
"libcoap/src/block.c" "libcoap/src/block.c"
"libcoap/src/coap_event.c" "libcoap/src/coap_event.c"
@ -22,7 +23,9 @@ set(COMPONENT_SRCS "libcoap/src/address.c"
set(COMPONENT_REQUIRES lwip) set(COMPONENT_REQUIRES lwip)
register_component() idf_component_register(SRCS "${srcs}"
INCLUDE_DIRS "${include_dirs}"
REQUIRES lwip)
# Silence format truncation warning, until it is fixed upstream # Silence format truncation warning, until it is fixed upstream
set_source_files_properties(libcoap/src/coap_debug.c PROPERTIES COMPILE_FLAGS -Wno-format-truncation) set_source_files_properties(libcoap/src/coap_debug.c PROPERTIES COMPILE_FLAGS -Wno-format-truncation)

9
components/console/CMakeLists.txt
View file

@ -1,7 +1,6 @@
set(COMPONENT_ADD_INCLUDEDIRS .) idf_component_register(SRCS "commands.c"
set(COMPONENT_SRCS "commands.c"
"split_argv.c" "split_argv.c"
"argtable3/argtable3.c" "argtable3/argtable3.c"
"linenoise/linenoise.c") "linenoise/linenoise.c"
register_component() INCLUDE_DIRS "."
REQUIRES vfs)

3
components/cxx/CMakeLists.txt
View file

@ -1,6 +1,5 @@
set(COMPONENT_SRCS "cxx_exception_stubs.cpp" idf_component_register(SRCS "cxx_exception_stubs.cpp"
"cxx_guards.cpp") "cxx_guards.cpp")
register_component()
target_link_libraries(${COMPONENT_LIB} PUBLIC stdc++ gcc) target_link_libraries(${COMPONENT_LIB} PUBLIC stdc++ gcc)
target_link_libraries(${COMPONENT_LIB} INTERFACE "-u __cxa_guard_dummy") target_link_libraries(${COMPONENT_LIB} INTERFACE "-u __cxa_guard_dummy")

9
components/cxx/test/CMakeLists.txt
View file

@ -1,6 +1,3 @@
set(COMPONENT_SRCDIRS ".") idf_component_register(SRC_DIRS "."
set(COMPONENT_ADD_INCLUDEDIRS ".") INCLUDE_DIRS "."
REQUIRES unity)
set(COMPONENT_REQUIRES unity)
register_component()

12
components/driver/CMakeLists.txt
View file

@ -1,4 +1,5 @@
set(COMPONENT_SRCS "can.c" set(srcs
"can.c"
"gpio.c" "gpio.c"
"i2c.c" "i2c.c"
"i2s.c" "i2s.c"
@ -20,12 +21,11 @@ set(COMPONENT_SRCS "can.c"
"spi_slave.c" "spi_slave.c"
"timer.c" "timer.c"
"uart.c") "uart.c")
set(COMPONENT_ADD_INCLUDEDIRS "include")
set(COMPONENT_PRIV_INCLUDEDIRS "include/driver")
set(COMPONENT_REQUIRES esp_ringbuf soc) #cannot totally hide soc headers, since there are a lot arguments in the driver are chip-dependent
register_component()
idf_component_register(SRCS "${srcs}"
INCLUDE_DIRS "include"
PRIV_INCLUDE_DIRS "include/driver"
REQUIRES esp_ringbuf soc) #cannot totally hide soc headers, since there are a lot arguments in the driver are chip-dependent
if(GCC_NOT_5_2_0) if(GCC_NOT_5_2_0)
# uses C11 atomic feature # uses C11 atomic feature

9
components/driver/test/CMakeLists.txt
View file

@ -1,6 +1,3 @@
set(COMPONENT_SRCDIRS ". param_test") idf_component_register(SRC_DIRS "." "param_test"
set(COMPONENT_ADD_INCLUDEDIRS "include param_test/include") INCLUDE_DIRS "include" "param_test/include"
REQUIRES unity test_utils driver nvs_flash)
set(COMPONENT_REQUIRES unity test_utils driver nvs_flash)
register_component()

12
components/efuse/CMakeLists.txt
View file

@ -3,16 +3,18 @@ idf_build_get_property(soc_name IDF_TARGET)
if(EXISTS "${COMPONENT_DIR}/${soc_name}") if(EXISTS "${COMPONENT_DIR}/${soc_name}")
include(${COMPONENT_DIR}/${soc_name}/sources.cmake) include(${COMPONENT_DIR}/${soc_name}/sources.cmake)
spaces2list(EFUSE_SOC_SRCS) spaces2list(EFUSE_SOC_SRCS)
add_prefix(COMPONENT_SRCS "${soc_name}/" ${EFUSE_SOC_SRCS}) add_prefix(srcs "${soc_name}/" ${EFUSE_SOC_SRCS})
set(COMPONENT_ADD_INCLUDEDIRS include ${soc_name}/include) set(include_dirs include ${soc_name}/include)
endif() endif()
list(APPEND COMPONENT_SRCS "src/esp_efuse_api.c" list(APPEND srcs
"src/esp_efuse_api.c"
"src/esp_efuse_fields.c" "src/esp_efuse_fields.c"
"src/esp_efuse_utility.c") "src/esp_efuse_utility.c")
set(COMPONENT_PRIV_REQUIRES bootloader_support soc) idf_component_register(SRCS "${srcs}"
register_component() PRIV_REQUIRES bootloader_support soc
INCLUDE_DIRS "${include_dirs}")
set(GEN_EFUSE_TABLE_ARG --max_blk_len ${CONFIG_EFUSE_MAX_BLK_LEN}) set(GEN_EFUSE_TABLE_ARG --max_blk_len ${CONFIG_EFUSE_MAX_BLK_LEN})

9
components/efuse/test/CMakeLists.txt
View file

@ -1,6 +1,3 @@
set(COMPONENT_SRCDIRS ".") idf_component_register(SRC_DIRS "."
set(COMPONENT_ADD_INCLUDEDIRS "." "include") INCLUDE_DIRS "." "include"
REQUIRES unity test_utils efuse bootloader_support)
set(COMPONENT_REQUIRES unity test_utils efuse bootloader_support)
register_component()

11
components/esp-tls/CMakeLists.txt
View file

@ -1,7 +1,4 @@
set(COMPONENT_SRCS "esp_tls.c") idf_component_register(SRCS "esp_tls.c"
set(COMPONENT_ADD_INCLUDEDIRS ".") INCLUDE_DIRS "."
REQUIRES mbedtls
set(COMPONENT_REQUIRES mbedtls) PRIV_REQUIRES lwip nghttp)
set(COMPONENT_PRIV_REQUIRES lwip nghttp)
register_component()

26
components/esp32/CMakeLists.txt
View file

@ -1,14 +1,11 @@
require_idf_targets(esp32)
if(BOOTLOADER_BUILD) if(BOOTLOADER_BUILD)
# For bootloader, all we need from esp32 is headers # For bootloader, all we need from esp32 is headers
set(COMPONENT_ADD_INCLUDEDIRS include) idf_component_register(INCLUDE_DIRS include)
register_component()
target_linker_script(${COMPONENT_LIB} INTERFACE "ld/esp32.peripherals.ld") target_linker_script(${COMPONENT_LIB} INTERFACE "ld/esp32.peripherals.ld")
else() else()
# Regular app build # Regular app build
set(srcs
set(COMPONENT_SRCS "brownout.c" "brownout.c"
"cache_err_int.c" "cache_err_int.c"
"cache_sram_mmu.c" "cache_sram_mmu.c"
"clk.c" "clk.c"
@ -32,19 +29,22 @@ else()
"spiram_psram.c" "spiram_psram.c"
"system_api.c" "system_api.c"
"task_wdt.c") "task_wdt.c")
set(COMPONENT_ADD_INCLUDEDIRS "include") set(include_dirs "include")
set(COMPONENT_REQUIRES driver esp_event efuse soc) #unfortunately rom/uart uses SOC registers directly set(requires driver esp_event efuse soc) #unfortunately rom/uart uses SOC registers directly
# driver is a public requirement because esp_sleep.h uses gpio_num_t & touch_pad_t # driver is a public requirement because esp_sleep.h uses gpio_num_t & touch_pad_t
# app_update is added here because cpu_start.c uses esp_ota_get_app_description() function. # app_update is added here because cpu_start.c uses esp_ota_get_app_description() function.
set(COMPONENT_PRIV_REQUIRES set(priv_requires app_trace app_update bootloader_support log mbedtls nvs_flash pthread
app_trace app_update bootloader_support log mbedtls nvs_flash pthread
smartconfig_ack spi_flash vfs wpa_supplicant espcoredump esp_common esp_wifi) smartconfig_ack spi_flash vfs wpa_supplicant espcoredump esp_common esp_wifi)
set(fragments linker.lf ld/esp32_fragments.lf)
set(COMPONENT_ADD_LDFRAGMENTS linker.lf ld/esp32_fragments.lf) idf_component_register(SRCS "${srcs}"
INCLUDE_DIRS "${include_dirs}"
register_component() LDFRAGMENTS "${fragments}"
REQUIRES "${requires}"
PRIV_REQUIRES "${priv_requires}"
REQUIRED_IDF_TARGETS esp32)
target_linker_script(${COMPONENT_LIB} INTERFACE "${CMAKE_CURRENT_BINARY_DIR}/esp32_out.ld") target_linker_script(${COMPONENT_LIB} INTERFACE "${CMAKE_CURRENT_BINARY_DIR}/esp32_out.ld")

9
components/esp32/test/CMakeLists.txt
View file

@ -1,9 +1,6 @@
set(COMPONENT_SRCDIRS ".") idf_component_register(SRC_DIRS "."
set(COMPONENT_ADD_INCLUDEDIRS ". ${CMAKE_CURRENT_BINARY_DIR}") INCLUDE_DIRS "." "${CMAKE_CURRENT_BINARY_DIR}"
REQUIRES unity test_utils nvs_flash ulp esp_common)
set(COMPONENT_REQUIRES unity test_utils nvs_flash ulp esp_common)
register_component()
add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/test_tjpgd_logo.h" add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/test_tjpgd_logo.h"
COMMAND xxd -i "logo.jpg" "${CMAKE_CURRENT_BINARY_DIR}/test_tjpgd_logo.h" COMMAND xxd -i "logo.jpg" "${CMAKE_CURRENT_BINARY_DIR}/test_tjpgd_logo.h"

9
components/esp_adc_cal/CMakeLists.txt
View file

@ -1,6 +1,3 @@
set(COMPONENT_SRCS "esp_adc_cal.c") idf_component_register(SRCS "esp_adc_cal.c"
set(COMPONENT_ADD_INCLUDEDIRS "include") INCLUDE_DIRS "include"
REQUIRES driver)
set(COMPONENT_REQUIRES)
register_component()

18
components/esp_common/CMakeLists.txt
View file

@ -1,27 +1,19 @@
if(BOOTLOADER_BUILD) if(BOOTLOADER_BUILD)
# For bootloader, all we need from esp_common is headers # For bootloader, all we need from esp_common is headers
set(COMPONENT_ADD_INCLUDEDIRS include) idf_component_register(INCLUDE_DIRS include)
set(COMPONENT_REQUIRES ${IDF_COMPONENTS})
set(COMPONENT_SRCS )
register_component()
set_property(TARGET ${COMPONENT_LIB} APPEND PROPERTY INTERFACE_LINK_LIBRARIES "-Wl,--gc-sections") set_property(TARGET ${COMPONENT_LIB} APPEND PROPERTY INTERFACE_LINK_LIBRARIES "-Wl,--gc-sections")
else() else()
# Regular app build # Regular app build
set(COMPONENT_SRCS idf_component_register(SRCS "src/dbg_stubs.c"
"src/dbg_stubs.c"
"src/esp_err_to_name.c" "src/esp_err_to_name.c"
"src/esp_timer.c" "src/esp_timer.c"
"src/ets_timer_legacy.c" "src/ets_timer_legacy.c"
"src/freertos_hooks.c" "src/freertos_hooks.c"
"src/ipc.c" "src/ipc.c"
"src/pm_locks.c" "src/pm_locks.c"
"src/stack_check.c") "src/stack_check.c"
set(COMPONENT_ADD_INCLUDEDIRS "include") INCLUDE_DIRS include
set(COMPONENT_PRIV_INCLUDEDIRS) PRIV_REQUIRES soc)
set(COMPONENT_REQUIRES)
set(COMPONENT_PRIV_REQUIRES soc)
register_component()
set_source_files_properties( set_source_files_properties(
"src/stack_check.c" "src/stack_check.c"

20
components/esp_event/CMakeLists.txt
View file

@ -1,19 +1,13 @@
set(COMPONENT_SRCS "default_event_loop.c" idf_component_register(SRCS "default_event_loop.c"
"esp_event.c" "esp_event.c"
"esp_event_private.c" "esp_event_private.c"
"event_loop_legacy.c" "event_loop_legacy.c"
"event_send.c") "event_send.c"
INCLUDE_DIRS "include"
set(COMPONENT_ADD_INCLUDEDIRS "include") PRIV_INCLUDE_DIRS "private_include"
set(COMPONENT_PRIV_INCLUDEDIRS "private_include") REQUIRES log tcpip_adapter
PRIV_REQUIRES ethernet
set(COMPONENT_REQUIRES log tcpip_adapter) LDFRAGMENTS linker.lf)
set(COMPONENT_PRIV_REQUIRES ethernet)
set(COMPONENT_REQUIRES log tcpip_adapter ethernet)
set(COMPONENT_ADD_LDFRAGMENTS linker.lf)
register_component()
if(GCC_NOT_5_2_0 AND CONFIG_ESP_EVENT_LOOP_PROFILING) if(GCC_NOT_5_2_0 AND CONFIG_ESP_EVENT_LOOP_PROFILING)
# uses C11 atomic feature # uses C11 atomic feature

8
components/esp_event/test/CMakeLists.txt
View file

@ -1,5 +1,3 @@
set(COMPONENT_SRCDIRS ".") idf_component_register(SRC_DIRS "."
set(COMPONENT_PRIV_INCLUDEDIRS "../private_include" ".") PRIV_INCLUDE_DIRS "../private_include" "."
set(COMPONENT_PRIV_REQUIRES unity test_utils esp_event driver) REQUIRES unity test_utils esp_event driver)
register_component()

15
components/esp_http_client/CMakeLists.txt
View file

@ -1,11 +1,8 @@
set(COMPONENT_SRCS "esp_http_client.c" idf_component_register(SRCS "esp_http_client.c"
"lib/http_auth.c" "lib/http_auth.c"
"lib/http_header.c" "lib/http_header.c"
"lib/http_utils.c") "lib/http_utils.c"
set(COMPONENT_ADD_INCLUDEDIRS "include") INCLUDE_DIRS "include"
set(COMPONENT_PRIV_INCLUDEDIRS "lib/include") PRIV_INCLUDE_DIRS "lib/include"
REQUIRES nghttp
set(COMPONENT_REQUIRES "nghttp") PRIV_REQUIRES mbedtls lwip esp-tls tcp_transport)
set(COMPONENT_PRIV_REQUIRES "mbedtls" "lwip" "esp-tls" "tcp_transport")
register_component()

9
components/esp_http_client/test/CMakeLists.txt
View file

@ -1,6 +1,3 @@
set(COMPONENT_SRCDIRS ".") idf_component_register(SRC_DIRS "."
set(COMPONENT_ADD_INCLUDEDIRS ".") INCLUDE_DIRS "."
REQUIRES unity test_utils esp_http_client)
set(COMPONENT_REQUIRES unity test_utils esp_http_client)
register_component()

15
components/esp_http_server/CMakeLists.txt
View file

@ -1,13 +1,10 @@
set(COMPONENT_ADD_INCLUDEDIRS include) idf_component_register(SRCS "src/httpd_main.c"
set(COMPONENT_PRIV_INCLUDEDIRS src/port/esp32 src/util)
set(COMPONENT_SRCS "src/httpd_main.c"
"src/httpd_parse.c" "src/httpd_parse.c"
"src/httpd_sess.c" "src/httpd_sess.c"
"src/httpd_txrx.c" "src/httpd_txrx.c"
"src/httpd_uri.c" "src/httpd_uri.c"
"src/util/ctrl_sock.c") "src/util/ctrl_sock.c"
INCLUDE_DIRS "include"
set(COMPONENT_REQUIRES nghttp) # for http_parser.h PRIV_INCLUDE_DIRS "src/port/esp32" "src/util"
set(COMPONENT_PRIV_REQUIRES lwip) REQUIRES nghttp # for http_parser.h
PRIV_REQUIRES lwip)
register_component()

9
components/esp_http_server/test/CMakeLists.txt
View file

@ -1,6 +1,3 @@
set(COMPONENT_SRCDIRS ".") idf_component_register(SRC_DIRS "."
set(COMPONENT_ADD_INCLUDEDIRS ".") INCLUDE_DIRS "."
REQUIRES unity test_utils esp_http_server)
set(COMPONENT_REQUIRES unity test_utils esp_http_server)
register_component()

11
components/esp_https_ota/CMakeLists.txt
View file

@ -1,7 +1,4 @@
set(COMPONENT_ADD_INCLUDEDIRS include) idf_component_register(SRCS "src/esp_https_ota.c"
set(COMPONENT_SRCS "src/esp_https_ota.c") INCLUDE_DIRS "include"
REQUIRES esp_http_client
set(COMPONENT_REQUIRES esp_http_client) PRIV_REQUIRES log app_update)
set(COMPONENT_PRIV_REQUIRES log app_update)
register_component()

11
components/esp_https_server/CMakeLists.txt
View file

@ -1,7 +1,4 @@
set(COMPONENT_ADD_INCLUDEDIRS include) idf_component_register(SRCS "src/https_server.c"
set(COMPONENT_SRCS "src/https_server.c") INCLUDE_DIRS "include"
REQUIRES esp_http_server openssl
set(COMPONENT_REQUIRES esp_http_server openssl) PRIV_REQUIRES lwip)
set(COMPONENT_PRIV_REQUIRES lwip)
register_component()

10
components/esp_ringbuf/CMakeLists.txt
View file

@ -1,7 +1,3 @@
set(COMPONENT_ADD_INCLUDEDIRS "include") idf_component_register(SRCS "ringbuf.c"
set(COMPONENT_SRCS "ringbuf.c") INCLUDE_DIRS "include"
set(COMPONENT_ADD_LDFRAGMENTS linker.lf) LDFRAGMENTS linker.lf)
set(COMPONENT_REQUIRES)
register_component()

9
components/esp_ringbuf/test/CMakeLists.txt
View file

@ -1,6 +1,3 @@
set(COMPONENT_SRCDIRS ".") idf_component_register(SRC_DIRS "."
set(COMPONENT_ADD_INCLUDEDIRS ".") INCLUDE_DIRS "."
REQUIRES unity test_utils)
set(COMPONENT_REQUIRES unity test_utils)
register_component()

11
components/esp_rom/CMakeLists.txt
View file

@ -1,9 +1,6 @@
if(BOOTLOADER_BUILD) if(BOOTLOADER_BUILD)
# For bootloader, all we need is headers # For bootloader, all we need is headers
set(COMPONENT_ADD_INCLUDEDIRS "include") idf_component_register(INCLUDE_DIRS include)
set(COMPONENT_REQUIRES ${IDF_COMPONENTS})
set(COMPONENT_SRCS)
register_component()
set(scripts set(scripts
"esp32/ld/esp32.rom.ld" "esp32/ld/esp32.rom.ld"
"esp32/ld/esp32.rom.newlib-funcs.ld" "esp32/ld/esp32.rom.newlib-funcs.ld"
@ -12,10 +9,8 @@ if(BOOTLOADER_BUILD)
target_linker_script(${COMPONENT_LIB} INTERFACE "${scripts}") target_linker_script(${COMPONENT_LIB} INTERFACE "${scripts}")
else() else()
# Regular app build # Regular app build
set(COMPONENT_SRCS "esp_rom.c") idf_component_register(SRCS "esp_rom.c"
set(COMPONENT_ADD_INCLUDEDIRS "include") INCLUDE_DIRS include)
register_component()
set(scripts set(scripts
"esp32/ld/esp32.rom.ld" "esp32/ld/esp32.rom.ld"

7
components/esp_websocket_client/CMakeLists.txt
View file

@ -1,4 +1,3 @@
set(COMPONENT_SRCS "esp_websocket_client.c") idf_component_register(SRCS "esp_websocket_client.c"
set(COMPONENT_ADD_INCLUDEDIRS "include") INCLUDE_DIRS "include"
set(COMPONENT_REQUIRES lwip esp-tls tcp_transport nghttp) REQUIRES lwip esp-tls tcp_transport nghttp)
register_component()

22
components/esp_wifi/CMakeLists.txt
View file

@ -1,23 +1,21 @@
idf_build_get_property(idf_target IDF_TARGET) idf_build_get_property(idf_target IDF_TARGET)
idf_build_get_property(build_dir BUILD_DIR)
set(COMPONENT_SRCS if(NOT CONFIG_ESP32_NO_BLOBS)
"src/coexist.c" set(ldfragments "linker.lf")
endif()
idf_component_register(SRCS "src/coexist.c"
"src/fast_crypto_ops.c" "src/fast_crypto_ops.c"
"src/lib_printf.c" "src/lib_printf.c"
"src/mesh_event.c" "src/mesh_event.c"
"src/phy_init.c" "src/phy_init.c"
"src/restore.c" "src/restore.c"
"src/wifi_init.c") "src/wifi_init.c"
set(COMPONENT_ADD_INCLUDEDIRS "include" "${idf_target}/include") INCLUDE_DIRS "include" "${idf_target}/include"
set(COMPONENT_PRIV_INCLUDEDIRS) PRIV_REQUIRES wpa_supplicant nvs_flash
set(COMPONENT_PRIV_REQUIRES wpa_supplicant nvs_flash) LDFRAGMENTS "${ldfragments}")
if(NOT CONFIG_ESP32_NO_BLOBS) idf_build_get_property(build_dir BUILD_DIR)
set(COMPONENT_ADD_LDFRAGMENTS "linker.lf")
endif()
register_component()
target_link_libraries(${COMPONENT_LIB} PUBLIC "-L ${CMAKE_CURRENT_SOURCE_DIR}/lib_${idf_target}") target_link_libraries(${COMPONENT_LIB} PUBLIC "-L ${CMAKE_CURRENT_SOURCE_DIR}/lib_${idf_target}")
if(NOT CONFIG_ESP32_NO_BLOBS) if(NOT CONFIG_ESP32_NO_BLOBS)

9
components/esp_wifi/test/CMakeLists.txt
View file

@ -1,9 +1,6 @@
set(COMPONENT_SRCDIRS ".") idf_component_register(SRC_DIRS "."
set(COMPONENT_ADD_INCLUDEDIRS ". ${CMAKE_CURRENT_BINARY_DIR}") INCLUDE_DIRS "." "${CMAKE_CURRENT_BINARY_DIR}"
REQUIRES unity test_utils nvs_flash ulp esp_common)
set(COMPONENT_REQUIRES unity test_utils nvs_flash ulp esp_common)
register_component()
idf_component_get_property(esp_wifi_dir esp_wifi COMPONENT_DIR) idf_component_get_property(esp_wifi_dir esp_wifi COMPONENT_DIR)

14
components/espcoredump/CMakeLists.txt
View file

@ -1,10 +1,8 @@
set(COMPONENT_PRIV_INCLUDEDIRS "include_core_dump") idf_component_register(SRCS "src/core_dump_common.c"
set(COMPONENT_ADD_INCLUDEDIRS "include")
set(COMPONENT_PRIV_REQUIRES spi_flash soc)
set(COMPONENT_ADD_LDFRAGMENTS linker.lf)
set(COMPONENT_SRCS "src/core_dump_common.c"
"src/core_dump_flash.c" "src/core_dump_flash.c"
"src/core_dump_port.c" "src/core_dump_port.c"
"src/core_dump_uart.c") "src/core_dump_uart.c"
INCLUDE_DIRS "include"
register_component() PRIV_INCLUDE_DIRS "include_core_dump"
LDFRAGMENTS linker.lf
PRIV_REQUIRES spi_flash soc)

7
components/espcoredump/test/CMakeLists.txt
View file

@ -1,8 +1,7 @@
if(TESTS_ALL EQUAL 1) if(TESTS_ALL EQUAL 1)
message("not linking coredump test from CI.") message("not linking coredump test from CI.")
else() else()
set(COMPONENT_SRCDIRS ".") idf_component_register(SRC_DIRS "."
set(COMPONENT_ADD_INCLUDEDIRS ".") INCLUDE_DIRS "."
set(COMPONENT_REQUIRES unity nvs_flash) REQUIRES unity nvs_flash)
register_component()
endif() endif()

3
components/esptool_py/CMakeLists.txt
View file

@ -1,5 +1,4 @@
set(COMPONENT_PRIV_REQUIRES bootloader) idf_component_register(REQUIRES bootloader)
register_component()
string(REPLACE ";" " " ESPTOOLPY_FLASH_PROJECT_OPTIONS "${ESPTOOLPY_ELF2IMAGE_FLASH_OPTIONS}") string(REPLACE ";" " " ESPTOOLPY_FLASH_PROJECT_OPTIONS "${ESPTOOLPY_ELF2IMAGE_FLASH_OPTIONS}")
set(ESPTOOLPY_FLASH_PROJECT_OPTIONS set(ESPTOOLPY_FLASH_PROJECT_OPTIONS

15
components/esptool_py/project_include.cmake
View file

@ -148,7 +148,10 @@ add_custom_target(flash_project_args_target)
# esptool_py_flash_project_args # esptool_py_flash_project_args
# #
# Add file to the flasher args list, to be flashed at a particular offset # Add file to the flasher args list, to be flashed at a particular offset.
#
# When a template FLASH_FILE_TEMPLATE is given, the variables OFFSET and IMAGE
# hold the value of arguments offset and image, respectively.
function(esptool_py_flash_project_args entry offset image) function(esptool_py_flash_project_args entry offset image)
set(options FLASH_IN_PROJECT) # flash the image when flashing the project set(options FLASH_IN_PROJECT) # flash the image when flashing the project
set(single_value FLASH_FILE_TEMPLATE) # template file to use to be able to set(single_value FLASH_FILE_TEMPLATE) # template file to use to be able to
@ -172,8 +175,16 @@ function(esptool_py_flash_project_args entry offset image)
if(NOT __FLASH_FILE_TEMPLATE) if(NOT __FLASH_FILE_TEMPLATE)
file(GENERATE OUTPUT ${entry_flash_args} CONTENT "${offset} ${image}") file(GENERATE OUTPUT ${entry_flash_args} CONTENT "${offset} ${image}")
else() else()
set(OFFSET ${offset})
set(IMAGE ${image})
get_filename_component(template "${__FLASH_FILE_TEMPLATE}" ABSOLUTE) get_filename_component(template "${__FLASH_FILE_TEMPLATE}" ABSOLUTE)
file(GENERATE OUTPUT ${entry_flash_args} INPUT ${template}) configure_file(${template} ${CMAKE_CURRENT_BINARY_DIR}/${template}.in2)
file(GENERATE OUTPUT ${entry_flash_args} INPUT ${CMAKE_CURRENT_BINARY_DIR}/${template}.in2)
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
APPEND PROPERTY
ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_CURRENT_BINARY_DIR}/${template}.in2})
unset(OFFSET)
unset(IMAGE)
endif() endif()
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}

12
components/ethernet/CMakeLists.txt
View file

@ -1,12 +1,8 @@
set(COMPONENT_SRCS "emac_dev.c" idf_component_register(SRCS "emac_dev.c"
"emac_main.c" "emac_main.c"
"eth_phy/phy_common.c" "eth_phy/phy_common.c"
"eth_phy/phy_lan8720.c" "eth_phy/phy_lan8720.c"
"eth_phy/phy_tlk110.c" "eth_phy/phy_tlk110.c"
"eth_phy/phy_ip101.c") "eth_phy/phy_ip101.c"
set(COMPONENT_ADD_INCLUDEDIRS "include") INCLUDE_DIRS "include"
PRIV_REQUIRES tcpip_adapter esp_event soc)
set(COMPONENT_REQUIRES)
set(COMPONENT_PRIV_REQUIRES tcpip_adapter esp_event soc)
register_component()

8
components/ethernet/test/CMakeLists.txt
View file

@ -1,5 +1,3 @@
set(COMPONENT_SRCDIRS ".") idf_component_register(SRC_DIRS "."
set(COMPONENT_ADD_INCLUDEDIRS ".") INCLUDE_DIRS "."
set(COMPONENT_REQUIRES unity ethernet) REQUIRES unity ethernet)
register_component()

7
components/expat/CMakeLists.txt
View file

@ -1,11 +1,10 @@
set(COMPONENT_ADD_INCLUDEDIRS expat/expat/lib port/include) idf_component_register(SRCS "expat/expat/lib/loadlibrary.c"
set(COMPONENT_SRCS "expat/expat/lib/loadlibrary.c"
"expat/expat/lib/xmlparse.c" "expat/expat/lib/xmlparse.c"
"expat/expat/lib/xmlrole.c" "expat/expat/lib/xmlrole.c"
"expat/expat/lib/xmltok.c" "expat/expat/lib/xmltok.c"
"expat/expat/lib/xmltok_impl.c" "expat/expat/lib/xmltok_impl.c"
"expat/expat/lib/xmltok_ns.c") "expat/expat/lib/xmltok_ns.c"
register_component() INCLUDE_DIRS expat/expat/lib port/include)
target_compile_definitions(${COMPONENT_LIB} PRIVATE HAVE_EXPAT_CONFIG_H) target_compile_definitions(${COMPONENT_LIB} PRIVATE HAVE_EXPAT_CONFIG_H)
target_compile_definitions(${COMPONENT_LIB} PRIVATE HAVE_GETRANDOM) target_compile_definitions(${COMPONENT_LIB} PRIVATE HAVE_GETRANDOM)

8
components/expat/test/CMakeLists.txt
View file

@ -1,5 +1,3 @@
set(COMPONENT_SRCDIRS ".") idf_component_register(SRC_DIRS "."
set(COMPONENT_ADD_INCLUDEDIRS ".") INCLUDE_DIRS "."
set(COMPONENT_REQUIRES unity expat) REQUIRES unity expat)
register_component()

11
components/fatfs/CMakeLists.txt
View file

@ -1,4 +1,4 @@
set(COMPONENT_SRCS "src/diskio.c" idf_component_register(SRCS "src/diskio.c"
"src/diskio_rawflash.c" "src/diskio_rawflash.c"
"src/diskio_sdmmc.c" "src/diskio_sdmmc.c"
"src/diskio_wl.c" "src/diskio_wl.c"
@ -7,9 +7,6 @@ set(COMPONENT_SRCS "src/diskio.c"
"src/ffunicode.c" "src/ffunicode.c"
"src/vfs_fat.c" "src/vfs_fat.c"
"src/vfs_fat_sdmmc.c" "src/vfs_fat_sdmmc.c"
"src/vfs_fat_spiflash.c") "src/vfs_fat_spiflash.c"
set(COMPONENT_ADD_INCLUDEDIRS src) INCLUDE_DIRS src
REQUIRES wear_levelling sdmmc)
set(COMPONENT_REQUIRES wear_levelling sdmmc)
register_component()

12
components/fatfs/test/CMakeLists.txt
View file

@ -1,8 +1,4 @@
set(COMPONENT_SRCDIRS ".") idf_component_register(SRC_DIRS "."
set(COMPONENT_ADD_INCLUDEDIRS ".") INCLUDE_DIRS "."
REQUIRES unity test_utils vfs fatfs
set(COMPONENT_REQUIRES unity test_utils vfs fatfs) EMBED_TXTFILES fatfs.img)
set(COMPONENT_EMBED_TXTFILES fatfs.img)
register_component()

15
components/freemodbus/CMakeLists.txt
View file

@ -1,6 +1,7 @@
# The following five lines of boilerplate have to be in your project's # The following five lines of boilerplate have to be in your project's
# CMakeLists in this exact order for cmake to work correctly # CMakeLists in this exact order for cmake to work correctly
set(COMPONENT_SRCS "common/esp_modbus_master.c" set(srcs
"common/esp_modbus_master.c"
"common/esp_modbus_slave.c" "common/esp_modbus_slave.c"
"modbus/mb.c" "modbus/mb.c"
"modbus/mb_m.c" "modbus/mb_m.c"
@ -31,11 +32,13 @@ set(COMPONENT_SRCS "common/esp_modbus_master.c"
"modbus/functions/mbutils.c" "modbus/functions/mbutils.c"
"serial_slave/modbus_controller/mbc_serial_slave.c" "serial_slave/modbus_controller/mbc_serial_slave.c"
"serial_master/modbus_controller/mbc_serial_master.c") "serial_master/modbus_controller/mbc_serial_master.c")
set(COMPONENT_ADD_INCLUDEDIRS common/include) set(include_dirs common/include)
set(COMPONENT_PRIV_INCLUDEDIRS common port modbus modbus/ascii modbus/functions set(priv_include_dirs common port modbus modbus/ascii modbus/functions
modbus/rtu modbus/tcp modbus/include) modbus/rtu modbus/tcp modbus/include)
list(APPEND COMPONENT_PRIV_INCLUDEDIRS serial_slave/port serial_slave/modbus_controller list(APPEND priv_include_dirs serial_slave/port serial_slave/modbus_controller
serial_master/port serial_master/modbus_controller) serial_master/port serial_master/modbus_controller)
set(COMPONENT_REQUIRES "driver")
register_component() idf_component_register(SRCS "${srcs}"
INCLUDE_DIRS "${include_dirs}"
PRIV_INCLUDE_DIRS "${priv_include_dirs}"
REQUIRES driver)

16
components/freertos/CMakeLists.txt
View file

@ -1,6 +1,5 @@
set(COMPONENT_ADD_INCLUDEDIRS include) set(srcs
set(COMPONENT_PRIV_INCLUDEDIRS include/freertos .) "croutine.c"
set(COMPONENT_SRCS "croutine.c"
"event_groups.c" "event_groups.c"
"FreeRTOS-openocd.c" "FreeRTOS-openocd.c"
"list.c" "list.c"
@ -19,11 +18,12 @@ set(COMPONENT_SRCS "croutine.c"
# app_trace is required by FreeRTOS headers only when CONFIG_SYSVIEW_ENABLE=y, # app_trace is required by FreeRTOS headers only when CONFIG_SYSVIEW_ENABLE=y,
# but requirements can't depend on config options, so always require it. # but requirements can't depend on config options, so always require it.
set(COMPONENT_REQUIRES app_trace) idf_component_register(SRCS "${srcs}"
set(COMPONENT_PRIV_REQUIRES esp_common soc) INCLUDE_DIRS include
set(COMPONENT_ADD_LDFRAGMENTS linker.lf) PRIV_INCLUDE_DIRS include/freertos .
LDFRAGMENTS linker.lf
register_component() REQUIRES app_trace
PRIV_REQUIRES soc)
target_link_libraries(${COMPONENT_LIB} INTERFACE "-Wl,--undefined=uxTopUsedPriority") target_link_libraries(${COMPONENT_LIB} INTERFACE "-Wl,--undefined=uxTopUsedPriority")

9
components/freertos/test/CMakeLists.txt
View file

@ -1,6 +1,3 @@
set(COMPONENT_SRCDIRS ".") idf_component_register(SRC_DIRS "."
set(COMPONENT_ADD_INCLUDEDIRS ".") INCLUDE_DIRS "."
REQUIRES unity test_utils)
set(COMPONENT_REQUIRES unity test_utils)
register_component()

17
components/heap/CMakeLists.txt
View file

@ -1,23 +1,24 @@
set(COMPONENT_SRCS "heap_caps.c" set(srcs
"heap_caps.c"
"heap_caps_init.c" "heap_caps_init.c"
"multi_heap.c") "multi_heap.c")
if(NOT CONFIG_HEAP_POISONING_DISABLED) if(NOT CONFIG_HEAP_POISONING_DISABLED)
list(APPEND COMPONENT_SRCS "multi_heap_poisoning.c") list(APPEND srcs "multi_heap_poisoning.c")
endif() endif()
if(CONFIG_HEAP_TASK_TRACKING) if(CONFIG_HEAP_TASK_TRACKING)
list(APPEND COMPONENT_SRCS "heap_task_info.c") list(APPEND srcs "heap_task_info.c")
endif() endif()
if(CONFIG_HEAP_TRACING_STANDALONE) if(CONFIG_HEAP_TRACING_STANDALONE)
list(APPEND COMPONENT_SRCS "heap_trace_standalone.c") list(APPEND srcs "heap_trace_standalone.c")
endif() endif()
set(COMPONENT_ADD_INCLUDEDIRS "include") idf_component_register(SRCS "${srcs}"
set(COMPONENT_ADD_LDFRAGMENTS linker.lf) INCLUDE_DIRS include
set(COMPONENT_PRIV_REQUIRES soc) LDFRAGMENTS linker.lf
register_component() PRIV_REQUIRES soc)
if(CONFIG_HEAP_TRACING) if(CONFIG_HEAP_TRACING)
set(WRAP_FUNCTIONS set(WRAP_FUNCTIONS

9
components/heap/test/CMakeLists.txt
View file

@ -1,6 +1,3 @@
set(COMPONENT_SRCDIRS ".") idf_component_register(SRC_DIRS "."
set(COMPONENT_ADD_INCLUDEDIRS ".") INCLUDE_DIRS "."
REQUIRES unity test_utils heap)
set(COMPONENT_REQUIRES unity test_utils heap)
register_component()

3
components/idf_test/CMakeLists.txt
View file

@ -1,2 +1 @@
set(COMPONENT_ADD_INCLUDEDIRS "include") idf_component_register(INCLUDE_DIRS include)
register_component()

5
components/jsmn/CMakeLists.txt
View file

@ -1,3 +1,2 @@
set(COMPONENT_SRCS "src/jsmn.c") idf_component_register(SRCS "src/jsmn.c"
set(COMPONENT_ADD_INCLUDEDIRS "include") INCLUDE_DIRS "include")
register_component()

7
components/json/CMakeLists.txt
View file

@ -1,5 +1,4 @@
set(COMPONENT_SRCS "cJSON/cJSON.c" idf_component_register(SRCS "cJSON/cJSON.c"
"cJSON/cJSON_Utils.c" "cJSON/cJSON_Utils.c"
"cJSON/test.c") "cJSON/test.c"
set(COMPONENT_ADD_INCLUDEDIRS cJSON) INCLUDE_DIRS cJSON)
register_component()

20
components/libsodium/CMakeLists.txt
View file

@ -1,7 +1,8 @@
set(SRC libsodium/src/libsodium) set(SRC libsodium/src/libsodium)
# Derived from libsodium/src/libsodium/Makefile.am # Derived from libsodium/src/libsodium/Makefile.am
# (ignoring the !MINIMAL set) # (ignoring the !MINIMAL set)
set(COMPONENT_SRCS "${SRC}/crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c" set(srcs
"${SRC}/crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c"
"${SRC}/crypto_aead/xchacha20poly1305/sodium/aead_xchacha20poly1305.c" "${SRC}/crypto_aead/xchacha20poly1305/sodium/aead_xchacha20poly1305.c"
"${SRC}/crypto_auth/crypto_auth.c" "${SRC}/crypto_auth/crypto_auth.c"
"${SRC}/crypto_auth/hmacsha256/auth_hmacsha256.c" "${SRC}/crypto_auth/hmacsha256/auth_hmacsha256.c"
@ -116,18 +117,21 @@ set(COMPONENT_SRCS "${SRC}/crypto_aead/chacha20poly1305/sodium/aead_chacha20poly
"port/randombytes_esp32.c") "port/randombytes_esp32.c")
if(CONFIG_LIBSODIUM_USE_MBEDTLS_SHA) if(CONFIG_LIBSODIUM_USE_MBEDTLS_SHA)
list(APPEND COMPONENT_SRCS "port/crypto_hash_mbedtls/crypto_hash_sha256_mbedtls.c" list(APPEND srcs
"port/crypto_hash_mbedtls/crypto_hash_sha256_mbedtls.c"
"port/crypto_hash_mbedtls/crypto_hash_sha512_mbedtls.c") "port/crypto_hash_mbedtls/crypto_hash_sha512_mbedtls.c")
else() else()
list(APPEND COMPONENT_SRCS "${SRC}/crypto_hash/sha256/cp/hash_sha256_cp.c" list(APPEND srcs
"${SRC}/crypto_hash/sha256/cp/hash_sha256_cp.c"
"${SRC}/crypto_hash/sha512/cp/hash_sha512_cp.c") "${SRC}/crypto_hash/sha512/cp/hash_sha512_cp.c")
endif() endif()
set(COMPONENT_ADD_INCLUDEDIRS ${SRC}/include port_include) set(include_dirs ${SRC}/include port_include)
set(COMPONENT_PRIV_INCLUDEDIRS ${SRC}/include/sodium port_include/sodium port) set(priv_include_dirs ${SRC}/include/sodium port_include/sodium port)
idf_component_register(SRCS "${srcs}"
set(COMPONENT_REQUIRES mbedtls) INCLUDE_DIRS "${include_dirs}"
register_component() PRIV_INCLUDE_DIRS "${priv_include_dirs}"
REQUIRES mbedtls)
target_compile_definitions(${COMPONENT_LIB} PRIVATE target_compile_definitions(${COMPONENT_LIB} PRIVATE
CONFIGURED CONFIGURED

10
components/libsodium/test/CMakeLists.txt
View file

@ -3,10 +3,6 @@ if(TESTS_ALL EQUAL 1)
else() else()
get_filename_component(LS_TESTDIR "${CMAKE_CURRENT_LIST_DIR}/../libsodium/test/default" ABSOLUTE) get_filename_component(LS_TESTDIR "${CMAKE_CURRENT_LIST_DIR}/../libsodium/test/default" ABSOLUTE)
set(COMPONENT_ADD_INCLUDEDIRS "." "${LS_TESTDIR}/../quirks")
set(COMPONENT_REQUIRES unity libsodium)
set(TEST_CASES "chacha20;aead_chacha20poly1305;box;box2;ed25519_convert;sign;hash") set(TEST_CASES "chacha20;aead_chacha20poly1305;box;box2;ed25519_convert;sign;hash")
foreach(test_case ${TEST_CASES}) foreach(test_case ${TEST_CASES})
@ -14,9 +10,9 @@ else()
list(APPEND TEST_CASES_FILES ${test_case_file}) list(APPEND TEST_CASES_FILES ${test_case_file})
endforeach() endforeach()
set(COMPONENT_SRCS "${TEST_CASES_FILES};test_sodium.c") idf_component_register(SRCS "${TEST_CASES_FILES}" "test_sodium.c"
INCLUDE_DIRS "." "${LS_TESTDIR}/../quirks"
register_component() REQUIRES unity libsodium)
# The libsodium test suite is designed to be run each test case as an executable on a desktop computer and uses # The libsodium test suite is designed to be run each test case as an executable on a desktop computer and uses
# filesytem to write & then compare contents of each file. # filesytem to write & then compare contents of each file.

7
components/log/CMakeLists.txt
View file

@ -1,4 +1,3 @@
set(COMPONENT_SRCS "log.c") idf_component_register(SRCS "log.c"
set(COMPONENT_ADD_INCLUDEDIRS "include") INCLUDE_DIRS "include"
set(COMPONENT_PRIV_REQUIRES soc) PRIV_REQUIRES soc)
register_component()

19
components/lwip/CMakeLists.txt
View file

@ -1,4 +1,4 @@
set(COMPONENT_ADD_INCLUDEDIRS set(include_dirs
include/apps include/apps
include/apps/sntp include/apps/sntp
lwip/src/include lwip/src/include
@ -6,7 +6,8 @@ set(COMPONENT_ADD_INCLUDEDIRS
port/esp32/include/arch port/esp32/include/arch
) )
set(COMPONENT_SRCS "apps/dhcpserver/dhcpserver.c" set(srcs
"apps/dhcpserver/dhcpserver.c"
"apps/ping/esp_ping.c" "apps/ping/esp_ping.c"
"apps/ping/ping.c" "apps/ping/ping.c"
"apps/sntp/sntp.c" "apps/sntp/sntp.c"
@ -91,7 +92,8 @@ set(COMPONENT_SRCS "apps/dhcpserver/dhcpserver.c"
"port/esp32/netif/wlanif.c") "port/esp32/netif/wlanif.c")
if(CONFIG_LWIP_PPP_SUPPORT) if(CONFIG_LWIP_PPP_SUPPORT)
list(APPEND COMPONENT_SRCS "lwip/src/netif/ppp/auth.c" list(APPEND srcs
"lwip/src/netif/ppp/auth.c"
"lwip/src/netif/ppp/ccp.c" "lwip/src/netif/ppp/ccp.c"
"lwip/src/netif/ppp/chap-md5.c" "lwip/src/netif/ppp/chap-md5.c"
"lwip/src/netif/ppp/chap-new.c" "lwip/src/netif/ppp/chap-new.c"
@ -123,12 +125,11 @@ if(CONFIG_LWIP_PPP_SUPPORT)
"lwip/src/netif/ppp/polarssl/sha1.c") "lwip/src/netif/ppp/polarssl/sha1.c")
endif() endif()
set(COMPONENT_REQUIRES vfs esp_wifi) idf_component_register(SRCS "${srcs}"
set(COMPONENT_PRIV_REQUIRES ethernet tcpip_adapter nvs_flash) INCLUDE_DIRS "${include_dirs}"
LDFRAGMENTS linker.lf
set(COMPONENT_ADD_LDFRAGMENTS linker.lf) REQUIRES vfs esp_wifi
PRIV_REQUIRES ethernet tcpip_adapter nvs_flash)
register_component()
# lots of LWIP source files evaluate macros that check address of stack variables # lots of LWIP source files evaluate macros that check address of stack variables
target_compile_options(${COMPONENT_LIB} PRIVATE -Wno-address) target_compile_options(${COMPONENT_LIB} PRIVATE -Wno-address)

8
components/mbedtls/CMakeLists.txt
View file

@ -1,8 +1,6 @@
set(COMPONENT_ADD_INCLUDEDIRS "port/include" "mbedtls/include") idf_component_register(SRCS "mbedtls.c"
set(COMPONENT_SRCS "mbedtls.c") INCLUDE_DIRS "port/include" "mbedtls/include"
set(COMPONENT_REQUIRES lwip) REQUIRES lwip)
register_component()
# Only build mbedtls libraries # Only build mbedtls libraries
set(ENABLE_TESTING CACHE BOOL OFF) set(ENABLE_TESTING CACHE BOOL OFF)

9
components/mbedtls/test/CMakeLists.txt
View file

@ -1,9 +1,6 @@
set(COMPONENT_SRCDIRS ".") idf_component_register(SRC_DIRS "."
set(COMPONENT_ADD_INCLUDEDIRS ".") INCLUDE_DIRS "."
REQUIRES unity test_utils mbedtls)
set(COMPONENT_REQUIRES unity test_utils mbedtls)
register_component()
idf_component_get_property(mbedtls mbedtls COMPONENT_LIB) idf_component_get_property(mbedtls mbedtls COMPONENT_LIB)
target_compile_definitions(${mbedtls} PUBLIC "-DMBEDTLS_DEPRECATED_WARNING") target_compile_definitions(${mbedtls} PUBLIC "-DMBEDTLS_DEPRECATED_WARNING")

12
components/mdns/CMakeLists.txt
View file

@ -1,9 +1,7 @@
set(COMPONENT_SRCS "mdns.c" idf_component_register(SRCS "mdns.c"
"mdns_console.c" "mdns_console.c"
"mdns_networking.c") "mdns_networking.c"
set(COMPONENT_ADD_INCLUDEDIRS "include") INCLUDE_DIRS "include"
set(COMPONENT_PRIV_INCLUDEDIRS "private_include") PRIV_INCLUDE_DIRS "private_include"
set(COMPONENT_REQUIRES lwip mbedtls console tcpip_adapter) REQUIRES lwip mbedtls console tcpip_adapter)
register_component()

5
components/mdns/test/CMakeLists.txt
View file

@ -1,3 +1,2 @@
set(COMPONENT_SRCDIRS ".") idf_component_register(SRC_DIRS "."
set(COMPONENT_PRIV_REQUIRES unity test_utils mdns) PRIV_REQUIRES unity test_utils mdns)
register_component()

13
components/mqtt/CMakeLists.txt
View file

@ -1,10 +1,7 @@
set(COMPONENT_ADD_INCLUDEDIRS esp-mqtt/include) idf_component_register(SRCS "esp-mqtt/mqtt_client.c"
set(COMPONENT_PRIV_INCLUDEDIRS "esp-mqtt/lib/include")
set(COMPONENT_SRCS "esp-mqtt/mqtt_client.c"
"esp-mqtt/lib/mqtt_msg.c" "esp-mqtt/lib/mqtt_msg.c"
"esp-mqtt/lib/mqtt_outbox.c" "esp-mqtt/lib/mqtt_outbox.c"
"esp-mqtt/lib/platform_esp32_idf.c") "esp-mqtt/lib/platform_esp32_idf.c"
INCLUDE_DIRS esp-mqtt/include
set(COMPONENT_REQUIRES lwip nghttp mbedtls tcp_transport) PRIV_INCLUDE_DIRS "esp-mqtt/lib/include"
REQUIRES lwip nghttp mbedtls tcp_transport)
register_component()

22
components/newlib/CMakeLists.txt
View file

@ -1,4 +1,5 @@
set(COMPONENT_SRCS "heap.c" set(srcs
"heap.c"
"locks.c" "locks.c"
"poll.c" "poll.c"
"pthread.c" "pthread.c"
@ -10,11 +11,11 @@ set(COMPONENT_SRCS "heap.c"
"termios.c" "termios.c"
"time.c" "time.c"
"utime.c") "utime.c")
set(COMPONENT_ADD_INCLUDEDIRS platform_include) set(include_dirs platform_include)
if(GCC_NOT_5_2_0) if(GCC_NOT_5_2_0)
if(CONFIG_SPIRAM_CACHE_WORKAROUND) if(CONFIG_SPIRAM_CACHE_WORKAROUND)
set(COMPONENT_ADD_LDFRAGMENTS esp32-spiram-rom-functions-c.lf) set(ldfragments esp32-spiram-rom-functions-c.lf)
endif() endif()
# Forces the linker to include locks, heap, and syscalls from this component, # Forces the linker to include locks, heap, and syscalls from this component,
@ -27,20 +28,21 @@ else()
# Remove this section when GCC 5.2.0 is no longer supported # Remove this section when GCC 5.2.0 is no longer supported
# 'include' and 'lib' directories should also be removed. # 'include' and 'lib' directories should also be removed.
# An if statement about LIB_PATH below should also be removed. # An if statement about LIB_PATH below should also be removed.
list(APPEND COMPONENT_ADD_INCLUDEDIRS include) list(APPEND include_dirs include)
set(LIB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/lib) set(LIB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/lib)
if(CONFIG_SPIRAM_CACHE_WORKAROUND) if(CONFIG_SPIRAM_CACHE_WORKAROUND)
set(COMPONENT_ADD_LDFRAGMENTS esp32-spiram-rom-functions-psram-workaround.lf) set(ldfragments esp32-spiram-rom-functions-psram-workaround.lf)
endif() endif()
endif() endif()
set(COMPONENT_REQUIRES vfs) # for sys/ioctl.h list(APPEND ldfragments newlib.lf)
set(COMPONENT_PRIV_REQUIRES soc)
list(APPEND COMPONENT_ADD_LDFRAGMENTS newlib.lf) idf_component_register(SRCS "${srcs}"
INCLUDE_DIRS "${include_dirs}"
register_component() REQUIRES vfs
PRIV_REQUIRES soc
LDFRAGMENTS "${ldfragments}")
if(LIB_PATH) if(LIB_PATH)
target_link_libraries(${COMPONENT_LIB} INTERFACE "-L ${LIB_PATH}") target_link_libraries(${COMPONENT_LIB} INTERFACE "-L ${LIB_PATH}")

9
components/newlib/test/CMakeLists.txt
View file

@ -1,6 +1,3 @@
set(COMPONENT_SRCDIRS ".") idf_component_register(SRC_DIRS "."
set(COMPONENT_ADD_INCLUDEDIRS ".") INCLUDE_DIRS "."
REQUIRES unity test_utils)
set(COMPONENT_REQUIRES unity test_utils)
register_component()

7
components/nghttp/CMakeLists.txt
View file

@ -1,5 +1,5 @@
set(COMPONENT_ADD_INCLUDEDIRS port/include nghttp2/lib/includes) set(srcs
set(COMPONENT_SRCS "nghttp2/lib/nghttp2_buf.c" "nghttp2/lib/nghttp2_buf.c"
"nghttp2/lib/nghttp2_callbacks.c" "nghttp2/lib/nghttp2_callbacks.c"
"nghttp2/lib/nghttp2_debug.c" "nghttp2/lib/nghttp2_debug.c"
"nghttp2/lib/nghttp2_frame.c" "nghttp2/lib/nghttp2_frame.c"
@ -23,6 +23,7 @@ set(COMPONENT_SRCS "nghttp2/lib/nghttp2_buf.c"
"nghttp2/lib/nghttp2_version.c" "nghttp2/lib/nghttp2_version.c"
"port/http_parser.c") "port/http_parser.c")
register_component() idf_component_register(SRCS "${srcs}"
INCLUDE_DIRS port/include nghttp2/lib/includes)
target_compile_definitions(${COMPONENT_LIB} PUBLIC "-DHAVE_CONFIG_H") target_compile_definitions(${COMPONENT_LIB} PUBLIC "-DHAVE_CONFIG_H")

11
components/nvs_flash/CMakeLists.txt
View file

@ -1,13 +1,10 @@
set(COMPONENT_SRCS "src/nvs_api.cpp" idf_component_register(SRCS "src/nvs_api.cpp"
"src/nvs_encr.cpp" "src/nvs_encr.cpp"
"src/nvs_item_hash_list.cpp" "src/nvs_item_hash_list.cpp"
"src/nvs_ops.cpp" "src/nvs_ops.cpp"
"src/nvs_page.cpp" "src/nvs_page.cpp"
"src/nvs_pagemanager.cpp" "src/nvs_pagemanager.cpp"
"src/nvs_storage.cpp" "src/nvs_storage.cpp"
"src/nvs_types.cpp") "src/nvs_types.cpp"
set(COMPONENT_ADD_INCLUDEDIRS include) REQUIRES spi_flash mbedtls
INCLUDE_DIRS include)
set(COMPONENT_REQUIRES spi_flash mbedtls)
register_component()

9
components/nvs_flash/test/CMakeLists.txt
View file

@ -1,6 +1,3 @@
set(COMPONENT_SRCDIRS ".") idf_component_register(SRCS "."
set(COMPONENT_ADD_INCLUDEDIRS ".") INCLUDE_DIRS "."
REQUIRES unity test_utils nvs_flash bootloader_support)
set(COMPONENT_REQUIRES unity test_utils nvs_flash bootloader_support)
register_component()

13
components/openssl/CMakeLists.txt
View file

@ -1,14 +1,11 @@
set(COMPONENT_ADD_INCLUDEDIRS include) idf_component_register(SRCS "library/ssl_cert.c"
set(COMPONENT_PRIV_INCLUDEDIRS include/internal include/platform include/openssl)
set(COMPONENT_SRCS "library/ssl_cert.c"
"library/ssl_lib.c" "library/ssl_lib.c"
"library/ssl_methods.c" "library/ssl_methods.c"
"library/ssl_pkey.c" "library/ssl_pkey.c"
"library/ssl_stack.c" "library/ssl_stack.c"
"library/ssl_x509.c" "library/ssl_x509.c"
"platform/ssl_pm.c" "platform/ssl_pm.c"
"platform/ssl_port.c") "platform/ssl_port.c"
REQUIRES mbedtls
set(COMPONENT_REQUIRES mbedtls) INCLUDE_DIRS include
PRIV_INCLUDE_DIRS include/internal include/platform include/openssl)
register_component()

2
components/partition_table/CMakeLists.txt
View file

@ -1,4 +1,4 @@
register_config_only_component() idf_component_register()
if(BOOTLOADER_BUILD) if(BOOTLOADER_BUILD)
return() return()

9
components/partition_table/test/CMakeLists.txt
View file

@ -1,6 +1,3 @@
set(COMPONENT_SRCDIRS ".") idf_component_register(SRC_DIRS "."
set(COMPONENT_ADD_INCLUDEDIRS ".") INCLUDE_DIRS "."
REQUIRES unity test_utils)
set(COMPONENT_REQUIRES unity test_utils)
register_component()

6
components/protobuf-c/CMakeLists.txt
View file

@ -1,4 +1,2 @@
set(COMPONENT_ADD_INCLUDEDIRS protobuf-c) idf_component_register(SRCS "protobuf-c/protobuf-c/protobuf-c.c"
set(COMPONENT_SRCS "protobuf-c/protobuf-c/protobuf-c.c") INCLUDE_DIRS protobuf-c)
register_component()

16
components/protocomm/CMakeLists.txt
View file

@ -1,8 +1,9 @@
set(COMPONENT_ADD_INCLUDEDIRS include/common set(include_dirs include/common
include/security include/security
include/transports) include/transports)
set(COMPONENT_PRIV_INCLUDEDIRS proto-c src/common src/simple_ble) set(priv_include_dirs proto-c src/common src/simple_ble)
set(COMPONENT_SRCS "src/common/protocomm.c" set(srcs
"src/common/protocomm.c"
"src/security/security0.c" "src/security/security0.c"
"src/security/security1.c" "src/security/security1.c"
"proto-c/constants.pb-c.c" "proto-c/constants.pb-c.c"
@ -12,14 +13,15 @@ set(COMPONENT_SRCS "src/common/protocomm.c"
"src/transports/protocomm_console.c" "src/transports/protocomm_console.c"
"src/transports/protocomm_httpd.c") "src/transports/protocomm_httpd.c")
set(COMPONENT_PRIV_REQUIRES protobuf-c mbedtls console esp_http_server bt)
if(CONFIG_BT_ENABLED) if(CONFIG_BT_ENABLED)
if(CONFIG_BT_BLUEDROID_ENABLED) if(CONFIG_BT_BLUEDROID_ENABLED)
list(APPEND COMPONENT_SRCS list(APPEND srcs
"src/simple_ble/simple_ble.c" "src/simple_ble/simple_ble.c"
"src/transports/protocomm_ble.c") "src/transports/protocomm_ble.c")
endif() endif()
endif() endif()
register_component() idf_component_register(SRCS "${srcs}"
INCLUDE_DIRS "${include_dirs}"
PRIV_INCLUDE_DIRS "${priv_include_dirs}"
PRIV_REQUIRES protobuf-c mbedtls console esp_http_server bt)

11
components/protocomm/test/CMakeLists.txt
View file

@ -1,7 +1,4 @@
set(COMPONENT_SRCDIRS ".") idf_component_register(SRC_DIRS "."
set(COMPONENT_ADD_INCLUDEDIRS ".") INCLUDE_DIRS "."
set(COMPONENT_PRIV_INCLUDEDIRS "../proto-c/") PRIV_INCLUDE_DIRS "../proto-c/"
REQUIRES unity mbedtls protocomm protobuf-c)
set(COMPONENT_REQUIRES unity mbedtls protocomm protobuf-c)
register_component()

7
components/pthread/CMakeLists.txt
View file

@ -1,8 +1,7 @@
set(COMPONENT_SRCS "pthread.c" idf_component_register(SRCS "pthread.c"
"pthread_cond_var.c" "pthread_cond_var.c"
"pthread_local_storage.c") "pthread_local_storage.c"
set(COMPONENT_ADD_INCLUDEDIRS "include") INCLUDE_DIRS include)
register_component()
if(CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP) if(CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP)
target_link_libraries(${COMPONENT_LIB} "-Wl,--wrap=vPortCleanUpTCB") target_link_libraries(${COMPONENT_LIB} "-Wl,--wrap=vPortCleanUpTCB")

9
components/pthread/test/CMakeLists.txt
View file

@ -1,6 +1,3 @@
set(COMPONENT_SRCDIRS ".") idf_component_register(SRC_DIRS "."
set(COMPONENT_ADD_INCLUDEDIRS ".") INCLUDE_DIRS "."
REQUIRES unity test_utils pthread)
set(COMPONENT_REQUIRES unity test_utils pthread)
register_component()

11
components/sdmmc/CMakeLists.txt
View file

@ -1,10 +1,9 @@
set(COMPONENT_SRCS "sdmmc_cmd.c" idf_component_register(SRCS "sdmmc_cmd.c"
"sdmmc_common.c" "sdmmc_common.c"
"sdmmc_init.c" "sdmmc_init.c"
"sdmmc_io.c" "sdmmc_io.c"
"sdmmc_mmc.c" "sdmmc_mmc.c"
"sdmmc_sd.c") "sdmmc_sd.c"
set(COMPONENT_ADD_INCLUDEDIRS "include") INCLUDE_DIRS include
set(COMPONENT_REQUIRES driver) REQUIRES driver
set(COMPONENT_PRIV_REQUIRES soc) PRIV_REQUIRES soc)
register_component()

9
components/sdmmc/test/CMakeLists.txt
View file

@ -1,6 +1,3 @@
set(COMPONENT_SRCDIRS ".") idf_component_register(SRC_DIRS "."
set(COMPONENT_ADD_INCLUDEDIRS ".") INCLUDE_DIRS "."
REQUIRES unity sdmmc)
set(COMPONENT_REQUIRES unity sdmmc)
register_component()

9
components/smartconfig_ack/CMakeLists.txt
View file

@ -1,6 +1,3 @@
set(COMPONENT_SRCS "smartconfig_ack.c") idf_component_register(SRCS "smartconfig_ack.c"
set(COMPONENT_ADD_INCLUDEDIRS "include") INCLUDE_DIRS include
PRIV_REQUIRES lwip tcpip_adapter)
set(COMPONENT_PRIV_REQUIRES lwip tcpip_adapter)
register_component()

17
components/soc/CMakeLists.txt
View file

@ -4,12 +4,13 @@ if(EXISTS "${COMPONENT_DIR}/${soc_name}")
include(${COMPONENT_DIR}/${soc_name}/sources.cmake) include(${COMPONENT_DIR}/${soc_name}/sources.cmake)
spaces2list(SOC_SRCS) spaces2list(SOC_SRCS)
add_prefix(COMPONENT_SRCS "${soc_name}/" ${SOC_SRCS}) add_prefix(srcs "${soc_name}/" ${SOC_SRCS})
set(COMPONENT_ADD_INCLUDEDIRS ${soc_name}/include) set(include_dirs ${soc_name}/include)
endif() endif()
list(APPEND COMPONENT_ADD_INCLUDEDIRS include) list(APPEND include_dirs include)
list(APPEND COMPONENT_SRCS "src/memory_layout_utils.c" list(APPEND srcs
"src/memory_layout_utils.c"
"src/lldesc.c" "src/lldesc.c"
"src/hal/spi_hal.c" "src/hal/spi_hal.c"
"src/hal/spi_hal_iram.c" "src/hal/spi_hal_iram.c"
@ -20,8 +21,6 @@ list(APPEND COMPONENT_SRCS "src/memory_layout_utils.c"
"src/hal/spi_flash_hal_iram.c" "src/hal/spi_flash_hal_iram.c"
) )
set(COMPONENT_ADD_LDFRAGMENTS linker.lf) idf_component_register(SRCS "${srcs}"
INCLUDE_DIRS "${include_dirs}"
set(COMPONENT_REQUIRES) LDFRAGMENTS linker.lf)
register_component()

11
components/soc/test/CMakeLists.txt
View file

@ -1,10 +1,11 @@
idf_build_get_property(soc_name IDF_TARGET) idf_build_get_property(soc_name IDF_TARGET)
get_filename_component(soc_test "${CMAKE_CURRENT_SOURCE_DIR}/../${soc_name}/test" ABSOLUTE) get_filename_component(soc_test "${CMAKE_CURRENT_SOURCE_DIR}/../${soc_name}/test" ABSOLUTE)
if(EXISTS "${soc_test}") if(EXISTS "${soc_test}")
set(COMPONENT_SRCS "${soc_test}") set(srcs "${soc_test}")
set(COMPONENT_ADD_INCLUDEDIRS "${soc_test}") set(include_dirs "${soc_test}")
endif() endif()
set(COMPONENT_REQUIRES unity test_utils) idf_component_register(SRC_DIRS "${src_dirs}"
INCLUDE_DIRS "${include_dirs}"
register_component() REQUIRES unity test_utils)

24
components/spi_flash/CMakeLists.txt
View file

@ -1,10 +1,11 @@
set(priv_requires bootloader_support soc)
if(BOOTLOADER_BUILD) if(BOOTLOADER_BUILD)
# Bootloader needs SPIUnlock from this file, but doesn't # Bootloader needs SPIUnlock from this file, but doesn't
# need other parts of this component # need other parts of this component
set(COMPONENT_SRCS "spi_flash_rom_patch.c") set(srcs "spi_flash_rom_patch.c")
set(COMPONENT_PRIV_REQUIRES bootloader_support soc)
else() else()
set(COMPONENT_SRCS "cache_utils.c" set(srcs
"cache_utils.c"
"flash_mmap.c" "flash_mmap.c"
"flash_ops.c" "flash_ops.c"
"partition.c" "partition.c"
@ -14,16 +15,15 @@ else()
"spi_flash_chip_issi.c" "spi_flash_chip_issi.c"
"spi_flash_os_func_app.c" "spi_flash_os_func_app.c"
"spi_flash_os_func_noos.c" "spi_flash_os_func_noos.c"
"memspi_host_driver.c" "memspi_host_driver.c")
)
if(NOT CONFIG_SPI_FLASH_USE_LEGACY_IMPL) if(NOT CONFIG_SPI_FLASH_USE_LEGACY_IMPL)
list(APPEND COMPONENT_SRCS "esp_flash_api.c") list(APPEND srcs "esp_flash_api.c")
endif() endif()
set(COMPONENT_PRIV_REQUIRES bootloader_support app_update soc) set(priv_requires bootloader_support app_update soc)
endif() endif()
set(COMPONENT_ADD_INCLUDEDIRS include) idf_component_register(SRCS "${srcs}"
set(COMPONENT_PRIV_INCLUDEDIRS private_include) PRIV_REQUIRES "${priv_requires}"
set(COMPONENT_ADD_LDFRAGMENTS linker.lf) INCLUDE_DIRS include
PRIV_INCLUDE_DIRS private_include
register_component() LDFRAGMENTS linker.lf)

9
components/spi_flash/test/CMakeLists.txt
View file

@ -1,6 +1,3 @@
set(COMPONENT_SRCDIRS ".") idf_component_register(SRC_DIRS "."
set(COMPONENT_ADD_INCLUDEDIRS ".") INCLUDE_DIRS "."
REQUIRES unity test_utils spi_flash bootloader_support app_update)
set(COMPONENT_REQUIRES unity test_utils spi_flash bootloader_support app_update)
register_component()

15
components/spiffs/CMakeLists.txt
View file

@ -1,15 +1,12 @@
set(COMPONENT_ADD_INCLUDEDIRS "include") idf_component_register(SRCS "esp_spiffs.c"
set(COMPONENT_PRIV_INCLUDEDIRS "." "spiffs/src")
set(COMPONENT_SRCS "esp_spiffs.c"
"spiffs_api.c" "spiffs_api.c"
"spiffs/src/spiffs_cache.c" "spiffs/src/spiffs_cache.c"
"spiffs/src/spiffs_check.c" "spiffs/src/spiffs_check.c"
"spiffs/src/spiffs_gc.c" "spiffs/src/spiffs_gc.c"
"spiffs/src/spiffs_hydrogen.c" "spiffs/src/spiffs_hydrogen.c"
"spiffs/src/spiffs_nucleus.c") "spiffs/src/spiffs_nucleus.c"
INCLUDE_DIRS "include"
set(COMPONENT_REQUIRES spi_flash) PRIV_INCLUDE_DIRS "." "spiffs/src"
set(COMPONENT_PRIV_REQUIRES bootloader_support) REQUIRES spi_flash
PRIV_REQUIRES bootloader_support)
register_component()

9
components/spiffs/test/CMakeLists.txt
View file

@ -1,6 +1,3 @@
set(COMPONENT_SRCDIRS ".") idf_component_register(SRC_DIRS "."
set(COMPONENT_ADD_INCLUDEDIRS ".") INCLUDE_DIRS "."
REQUIRES unity test_utils spiffs)
set(COMPONENT_REQUIRES unity test_utils spiffs)
register_component()

12
components/tcp_transport/CMakeLists.txt
View file

@ -1,12 +1,8 @@
set(COMPONENT_SRCS "transport.c" idf_component_register(SRCS "transport.c"
"transport_ssl.c" "transport_ssl.c"
"transport_tcp.c" "transport_tcp.c"
"transport_ws.c" "transport_ws.c"
"transport_utils.c" "transport_utils.c"
"transport_strcasestr.c") "transport_strcasestr.c"
INCLUDE_DIRS include
set(COMPONENT_ADD_INCLUDEDIRS "include") REQUIRES lwip esp-tls)
set(COMPONENT_REQUIRES lwip esp-tls)
register_component()

10
components/tcpip_adapter/CMakeLists.txt
View file

@ -1,7 +1,3 @@
set(COMPONENT_SRCS "event_handlers.c" idf_component_register(SRCS "event_handlers.c" "tcpip_adapter_lwip.c"
"tcpip_adapter_lwip.c") INCLUDE_DIRS include
set(COMPONENT_ADD_INCLUDEDIRS "include") REQUIRES lwip ethernet)
set(COMPONENT_REQUIRES lwip)
register_component()

7
components/ulp/CMakeLists.txt
View file

@ -1,4 +1,3 @@
set(COMPONENT_SRCS "ulp.c" idf_component_register(SRCS "ulp.c"
"ulp_macro.c") "ulp_macro.c"
set(COMPONENT_ADD_INCLUDEDIRS "include") INCLUDE_DIRS include)
register_component()

9
components/ulp/test/CMakeLists.txt
View file

@ -1,9 +1,6 @@
set(COMPONENT_SRCDIRS ".") idf_component_register(SRC_DIRS "."
set(COMPONENT_ADD_INCLUDEDIRS ".") INCLUDE_DIRS "."
REQUIRES unity ulp soc esp_common)
set(COMPONENT_REQUIRES unity ulp soc esp_common)
register_component()
set(ulp_app_name ulp_test_app) set(ulp_app_name ulp_test_app)
set(ulp_s_sources "ulp/test_jumps.S") set(ulp_s_sources "ulp/test_jumps.S")

13
components/unity/CMakeLists.txt
View file

@ -1,22 +1,21 @@
set(COMPONENT_SRCS "unity/src/unity.c" set(srcs
"unity/src/unity.c"
"unity_port_esp32.c") "unity_port_esp32.c")
set(COMPONENT_ADD_INCLUDEDIRS "include"
"unity/src")
if(CONFIG_UNITY_ENABLE_BACKTRACE_ON_FAIL) if(CONFIG_UNITY_ENABLE_BACKTRACE_ON_FAIL)
list(APPEND COMPONENT_PRIV_INCLUDEDIRS "include/priv") list(APPEND COMPONENT_PRIV_INCLUDEDIRS "include/priv")
endif() endif()
if(CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER) if(CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER)
list(APPEND COMPONENT_SRCS "unity_runner.c") list(APPEND srcs "unity_runner.c")
endif() endif()
if(CONFIG_UNITY_ENABLE_FIXTURE) if(CONFIG_UNITY_ENABLE_FIXTURE)
list(APPEND COMPONENT_SRCS "unity/extras/fixture/src/unity_fixture.c") list(APPEND srcs "unity/extras/fixture/src/unity_fixture.c")
endif() endif()
register_component() idf_component_register(SRCS "${srcs}"
INCLUDE_DIRS "include" "unity/src")
target_compile_definitions(${COMPONENT_LIB} PUBLIC target_compile_definitions(${COMPONENT_LIB} PUBLIC
-DUNITY_INCLUDE_CONFIG_H -DUNITY_INCLUDE_CONFIG_H

7
components/vfs/CMakeLists.txt
View file

@ -1,8 +1,7 @@
set(COMPONENT_SRCS "vfs.c" idf_component_register(SRCS "vfs.c"
"vfs_uart.c" "vfs_uart.c"
"vfs_semihost.c") "vfs_semihost.c"
set(COMPONENT_ADD_INCLUDEDIRS "include") INCLUDE_DIRS include)
register_component()
# Some newlib syscalls are implemented in vfs.c, make sure these are always # Some newlib syscalls are implemented in vfs.c, make sure these are always
# seen by the linker # seen by the linker

12
components/vfs/test/CMakeLists.txt
View file

@ -1,8 +1,4 @@
set(COMPONENT_SRCDIRS ".") idf_component_register(SRC_DIRS "."
set(COMPONENT_ADD_INCLUDEDIRS ".") INCLUDE_DIRS "."
REQUIRES unity test_utils vfs fatfs spiffs
set(COMPONENT_REQUIRES unity test_utils vfs fatfs spiffs) LDFRAGMENTS linker.lf)
set(COMPONENT_ADD_LDFRAGMENTS linker.lf)
register_component()

11
components/wear_levelling/CMakeLists.txt
View file

@ -1,11 +1,10 @@
set(COMPONENT_SRCS "Partition.cpp" idf_component_register(SRCS "Partition.cpp"
"SPI_Flash.cpp" "SPI_Flash.cpp"
"WL_Ext_Perf.cpp" "WL_Ext_Perf.cpp"
"WL_Ext_Safe.cpp" "WL_Ext_Safe.cpp"
"WL_Flash.cpp" "WL_Flash.cpp"
"crc32.cpp" "crc32.cpp"
"wear_levelling.cpp") "wear_levelling.cpp"
set(COMPONENT_ADD_INCLUDEDIRS "include") INCLUDE_DIRS include
set(COMPONENT_PRIV_INCLUDEDIRS private_include) PRIV_INCLUDE_DIRS private_include
set(COMPONENT_REQUIRES spi_flash) REQUIRES spi_flash)
register_component()

12
components/wear_levelling/test/CMakeLists.txt
View file

@ -1,8 +1,4 @@
set(COMPONENT_SRCDIRS ".") idf_component_register(SRC_DIRS "."
set(COMPONENT_ADD_INCLUDEDIRS ".") INCLUDE_DIRS "."
REQUIRES unity test_utils wear_levelling
set(COMPONENT_REQUIRES unity test_utils wear_levelling) EMBED_FILES test_partition_v1.bin)
set(COMPONENT_EMBED_FILES test_partition_v1.bin)
register_component()

15
components/wifi_provisioning/CMakeLists.txt
View file

@ -1,6 +1,4 @@
set(COMPONENT_ADD_INCLUDEDIRS include) set(srcs "src/wifi_config.c"
set(COMPONENT_PRIV_INCLUDEDIRS src proto-c ../protocomm/proto-c)
set(COMPONENT_SRCS "src/wifi_config.c"
"src/manager.c" "src/manager.c"
"src/handlers.c" "src/handlers.c"
"src/scheme_softap.c" "src/scheme_softap.c"
@ -8,14 +6,15 @@ set(COMPONENT_SRCS "src/wifi_config.c"
"proto-c/wifi_config.pb-c.c" "proto-c/wifi_config.pb-c.c"
"proto-c/wifi_constants.pb-c.c") "proto-c/wifi_constants.pb-c.c")
set(COMPONENT_REQUIRES lwip protocomm)
set(COMPONENT_PRIV_REQUIRES protobuf-c bt mdns json)
if(CONFIG_BT_ENABLED) if(CONFIG_BT_ENABLED)
if(CONFIG_BT_BLUEDROID_ENABLED) if(CONFIG_BT_BLUEDROID_ENABLED)
list(APPEND COMPONENT_SRCS list(APPEND srcs
"src/scheme_ble.c") "src/scheme_ble.c")
endif() endif()
endif() endif()
register_component() idf_component_register(SRCS "${srcs}"
INCLUDE_DIRS include
PRIV_INCLUDE_DIRS src proto-c ../protocomm/proto-c
REQUIRES lwip protocomm
PRIV_REQUIRES protobuf-c bt mdns json)

11
components/wpa_supplicant/CMakeLists.txt
View file

@ -1,4 +1,5 @@
set(COMPONENT_SRCS "port/os_xtensa.c" set(srcs
"port/os_xtensa.c"
"src/crypto/aes-cbc.c" "src/crypto/aes-cbc.c"
"src/crypto/aes-internal-dec.c" "src/crypto/aes-internal-dec.c"
"src/crypto/aes-internal-enc.c" "src/crypto/aes-internal-enc.c"
@ -72,12 +73,10 @@ set(COMPONENT_SRCS "port/os_xtensa.c"
"src/wps/wps_enrollee.c" "src/wps/wps_enrollee.c"
"src/wps/wps_registrar.c" "src/wps/wps_registrar.c"
"src/wps/wps_validate.c") "src/wps/wps_validate.c")
set(COMPONENT_ADD_INCLUDEDIRS include port/include)
set(COMPONENT_REQUIRES "") idf_component_register(SRCS "${srcs}"
set(COMPONENT_PRIV_REQUIRES mbedtls) INCLUDE_DIRS include port/include
PRIV_REQUIRES mbedtls)
register_component()
target_compile_options(${COMPONENT_LIB} PRIVATE -Wno-strict-aliasing) target_compile_options(${COMPONENT_LIB} PRIVATE -Wno-strict-aliasing)
target_compile_definitions(${COMPONENT_LIB} PRIVATE target_compile_definitions(${COMPONENT_LIB} PRIVATE

Some files were not shown because too many files have changed in this diff Show more