diff --git a/components/app_trace/test/CMakeLists.txt b/components/app_trace/test/CMakeLists.txt index 16aca8779..d574eb7ba 100644 --- a/components/app_trace/test/CMakeLists.txt +++ b/components/app_trace/test/CMakeLists.txt @@ -1,3 +1,3 @@ idf_component_register(SRC_DIRS "." - INCLUDE_DIRS "." - REQUIRES unity) \ No newline at end of file + PRIV_INCLUDE_DIRS "." + PRIV_REQUIRES unity) \ No newline at end of file diff --git a/components/app_update/test/CMakeLists.txt b/components/app_update/test/CMakeLists.txt index 09d19a821..f140cffa0 100644 --- a/components/app_update/test/CMakeLists.txt +++ b/components/app_update/test/CMakeLists.txt @@ -1,4 +1,4 @@ idf_component_register(SRC_DIRS "." - INCLUDE_DIRS "." - REQUIRES unity test_utils app_update bootloader_support nvs_flash + PRIV_INCLUDE_DIRS "." + PRIV_REQUIRES unity test_utils app_update bootloader_support nvs_flash ) \ No newline at end of file diff --git a/components/bootloader_support/test/CMakeLists.txt b/components/bootloader_support/test/CMakeLists.txt index a31c17934..fb3d92566 100644 --- a/components/bootloader_support/test/CMakeLists.txt +++ b/components/bootloader_support/test/CMakeLists.txt @@ -1,3 +1,3 @@ idf_component_register(SRC_DIRS "." - INCLUDE_DIRS "." - REQUIRES unity bootloader_support app_update) + PRIV_INCLUDE_DIRS "." + PRIV_REQUIRES unity bootloader_support app_update) diff --git a/components/bt/test/CMakeLists.txt b/components/bt/test/CMakeLists.txt index 0012e8bd1..34fac91ea 100644 --- a/components/bt/test/CMakeLists.txt +++ b/components/bt/test/CMakeLists.txt @@ -1,5 +1,5 @@ if(CONFIG_BT_ENABLED OR CMAKE_BUILD_EARLY_EXPANSION) idf_component_register(SRC_DIRS "." - INCLUDE_DIRS "." - REQUIRES unity nvs_flash bt) + PRIV_INCLUDE_DIRS "." + PRIV_REQUIRES unity nvs_flash bt) endif() \ No newline at end of file diff --git a/components/console/test/CMakeLists.txt b/components/console/test/CMakeLists.txt index 9c41fbaf3..135621624 100644 --- a/components/console/test/CMakeLists.txt +++ b/components/console/test/CMakeLists.txt @@ -1,3 +1,3 @@ idf_component_register(SRC_DIRS . - INCLUDE_DIRS . + PRIV_INCLUDE_DIRS . PRIV_REQUIRES unity test_utils console) diff --git a/components/cxx/test/CMakeLists.txt b/components/cxx/test/CMakeLists.txt index 16aca8779..d574eb7ba 100644 --- a/components/cxx/test/CMakeLists.txt +++ b/components/cxx/test/CMakeLists.txt @@ -1,3 +1,3 @@ idf_component_register(SRC_DIRS "." - INCLUDE_DIRS "." - REQUIRES unity) \ No newline at end of file + PRIV_INCLUDE_DIRS "." + PRIV_REQUIRES unity) \ No newline at end of file diff --git a/components/driver/test/CMakeLists.txt b/components/driver/test/CMakeLists.txt index 11e9c0474..05d12cf5c 100644 --- a/components/driver/test/CMakeLists.txt +++ b/components/driver/test/CMakeLists.txt @@ -1,3 +1,3 @@ idf_component_register(SRC_DIRS . param_test - INCLUDE_DIRS include param_test/include - REQUIRES unity test_utils driver nvs_flash esp_serial_slave_link infrared_tools) + PRIV_INCLUDE_DIRS include param_test/include + PRIV_REQUIRES unity test_utils driver nvs_flash esp_serial_slave_link infrared_tools) diff --git a/components/efuse/test/CMakeLists.txt b/components/efuse/test/CMakeLists.txt index 794f8e888..e31eefc22 100644 --- a/components/efuse/test/CMakeLists.txt +++ b/components/efuse/test/CMakeLists.txt @@ -1,5 +1,5 @@ idf_component_register(SRC_DIRS "." - INCLUDE_DIRS "." "include" + PRIV_INCLUDE_DIRS "." "include" PRIV_INCLUDE_DIRS "../private_include" - REQUIRES unity test_utils efuse bootloader_support + PRIV_REQUIRES unity test_utils efuse bootloader_support ) \ No newline at end of file diff --git a/components/esp32/test/CMakeLists.txt b/components/esp32/test/CMakeLists.txt index d9f57f462..a0940e047 100644 --- a/components/esp32/test/CMakeLists.txt +++ b/components/esp32/test/CMakeLists.txt @@ -1,7 +1,7 @@ if(IDF_TARGET STREQUAL "esp32") idf_component_register(SRC_DIRS . - INCLUDE_DIRS . ${CMAKE_CURRENT_BINARY_DIR} - REQUIRES unity test_utils nvs_flash ulp esp_common + PRIV_INCLUDE_DIRS . ${CMAKE_CURRENT_BINARY_DIR} + PRIV_REQUIRES unity test_utils nvs_flash ulp esp_common ) add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/test_tjpgd_logo.h" diff --git a/components/esp32s2/test/CMakeLists.txt b/components/esp32s2/test/CMakeLists.txt index 41f430e49..155d8969f 100644 --- a/components/esp32s2/test/CMakeLists.txt +++ b/components/esp32s2/test/CMakeLists.txt @@ -1,7 +1,7 @@ if(IDF_TARGET STREQUAL "esp32s2") idf_component_register(SRC_DIRS . - INCLUDE_DIRS . ${CMAKE_CURRENT_BINARY_DIR} - REQUIRES unity test_utils nvs_flash ulp esp_common + PRIV_INCLUDE_DIRS . ${CMAKE_CURRENT_BINARY_DIR} + PRIV_REQUIRES unity test_utils nvs_flash ulp esp_common ) add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/test_tjpgd_logo.h" diff --git a/components/esp_common/test/CMakeLists.txt b/components/esp_common/test/CMakeLists.txt index 30def4ebd..20a390731 100644 --- a/components/esp_common/test/CMakeLists.txt +++ b/components/esp_common/test/CMakeLists.txt @@ -1,3 +1,3 @@ idf_component_register(SRC_DIRS . - REQUIRES unity spi_flash + PRIV_REQUIRES unity spi_flash ) \ No newline at end of file diff --git a/components/esp_eth/test/CMakeLists.txt b/components/esp_eth/test/CMakeLists.txt index 2f0334536..0be5a5e49 100644 --- a/components/esp_eth/test/CMakeLists.txt +++ b/components/esp_eth/test/CMakeLists.txt @@ -1,4 +1,4 @@ idf_component_register(SRC_DIRS . - INCLUDE_DIRS . + PRIV_INCLUDE_DIRS . PRIV_REQUIRES unity test_utils esp_eth esp_http_client ) diff --git a/components/esp_http_client/test/CMakeLists.txt b/components/esp_http_client/test/CMakeLists.txt index 70fc98dca..202d2fed1 100644 --- a/components/esp_http_client/test/CMakeLists.txt +++ b/components/esp_http_client/test/CMakeLists.txt @@ -1,3 +1,3 @@ idf_component_register(SRC_DIRS "." - INCLUDE_DIRS "." - REQUIRES unity test_utils esp_http_client) \ No newline at end of file + PRIV_INCLUDE_DIRS "." + PRIV_REQUIRES unity test_utils esp_http_client) \ No newline at end of file diff --git a/components/esp_http_server/test/CMakeLists.txt b/components/esp_http_server/test/CMakeLists.txt index e2ceeb298..06a638c13 100644 --- a/components/esp_http_server/test/CMakeLists.txt +++ b/components/esp_http_server/test/CMakeLists.txt @@ -1,3 +1,3 @@ idf_component_register(SRC_DIRS "." - INCLUDE_DIRS "." - REQUIRES unity test_utils esp_http_server) \ No newline at end of file + PRIV_INCLUDE_DIRS "." + PRIV_REQUIRES unity test_utils esp_http_server) \ No newline at end of file diff --git a/components/esp_netif/test/CMakeLists.txt b/components/esp_netif/test/CMakeLists.txt index 513d8ad98..8efc8936a 100644 --- a/components/esp_netif/test/CMakeLists.txt +++ b/components/esp_netif/test/CMakeLists.txt @@ -1,5 +1,3 @@ -set(COMPONENT_SRCDIRS ".") -set(COMPONENT_PRIV_INCLUDEDIRS "../private_include" ".") -set(COMPONENT_PRIV_REQUIRES unity test_utils esp_netif nvs_flash) - -register_component() \ No newline at end of file +idf_component_register(SRC_DIRS "." + PRIV_INCLUDE_DIRS "../private_include" "." + PRIV_REQUIRES unity test_utils esp_netif nvs_flash) \ No newline at end of file diff --git a/components/esp_ringbuf/test/CMakeLists.txt b/components/esp_ringbuf/test/CMakeLists.txt index b531a1450..c11715181 100644 --- a/components/esp_ringbuf/test/CMakeLists.txt +++ b/components/esp_ringbuf/test/CMakeLists.txt @@ -1,3 +1,3 @@ idf_component_register(SRC_DIRS "." - INCLUDE_DIRS "." - REQUIRES unity test_utils) \ No newline at end of file + PRIV_INCLUDE_DIRS "." + PRIV_REQUIRES unity test_utils) \ No newline at end of file diff --git a/components/esp_timer/test/CMakeLists.txt b/components/esp_timer/test/CMakeLists.txt index e78a64e2a..f3ffa1f60 100644 --- a/components/esp_timer/test/CMakeLists.txt +++ b/components/esp_timer/test/CMakeLists.txt @@ -1,6 +1,6 @@ idf_component_register(SRC_DIRS "." PRIV_INCLUDE_DIRS "../private_include" - REQUIRES unity test_utils) + PRIV_REQUIRES unity test_utils) if(CONFIG_ESP_TIMER_IMPL_FRC2) idf_build_set_property(COMPILE_DEFINITIONS "-DESP_TIMER_DYNAMIC_OVERFLOW_VAL" APPEND) diff --git a/components/esp_wifi/test/CMakeLists.txt b/components/esp_wifi/test/CMakeLists.txt index fdf279b4a..9cfc6c49f 100644 --- a/components/esp_wifi/test/CMakeLists.txt +++ b/components/esp_wifi/test/CMakeLists.txt @@ -1,4 +1,4 @@ idf_component_register(SRC_DIRS . - INCLUDE_DIRS . ${CMAKE_CURRENT_BINARY_DIR} - REQUIRES unity test_utils nvs_flash ulp esp_common + PRIV_INCLUDE_DIRS . ${CMAKE_CURRENT_BINARY_DIR} + PRIV_REQUIRES unity test_utils nvs_flash ulp esp_common ) diff --git a/components/espcoredump/test/CMakeLists.txt b/components/espcoredump/test/CMakeLists.txt index c000ba4e5..72841c52d 100644 --- a/components/espcoredump/test/CMakeLists.txt +++ b/components/espcoredump/test/CMakeLists.txt @@ -2,6 +2,6 @@ if(TESTS_ALL EQUAL 1) message("not linking coredump test from CI.") else() idf_component_register(SRC_DIRS "." - INCLUDE_DIRS "." - REQUIRES unity nvs_flash) + PRIV_INCLUDE_DIRS "." + PRIV_REQUIRES unity nvs_flash) endif() \ No newline at end of file diff --git a/components/expat/test/CMakeLists.txt b/components/expat/test/CMakeLists.txt index 28d0afb41..6e5f5cadd 100644 --- a/components/expat/test/CMakeLists.txt +++ b/components/expat/test/CMakeLists.txt @@ -1,3 +1,3 @@ idf_component_register(SRC_DIRS "." - INCLUDE_DIRS "." - REQUIRES unity expat) \ No newline at end of file + PRIV_INCLUDE_DIRS "." + PRIV_REQUIRES unity expat) \ No newline at end of file diff --git a/components/fatfs/test/CMakeLists.txt b/components/fatfs/test/CMakeLists.txt index bb32fd2d9..d1a90750b 100644 --- a/components/fatfs/test/CMakeLists.txt +++ b/components/fatfs/test/CMakeLists.txt @@ -1,5 +1,5 @@ idf_component_register(SRC_DIRS . - INCLUDE_DIRS . - REQUIRES unity test_utils vfs fatfs + PRIV_INCLUDE_DIRS . + PRIV_REQUIRES unity test_utils vfs fatfs EMBED_TXTFILES fatfs.img ) \ No newline at end of file diff --git a/components/freertos/test/CMakeLists.txt b/components/freertos/test/CMakeLists.txt index 6037c945d..8b3fd3809 100644 --- a/components/freertos/test/CMakeLists.txt +++ b/components/freertos/test/CMakeLists.txt @@ -1,4 +1,4 @@ idf_component_register(SRC_DIRS . - INCLUDE_DIRS . - REQUIRES unity test_utils + PRIV_INCLUDE_DIRS . + PRIV_REQUIRES unity test_utils ) \ No newline at end of file diff --git a/components/heap/test/CMakeLists.txt b/components/heap/test/CMakeLists.txt index b70637f26..a04ffe0bb 100644 --- a/components/heap/test/CMakeLists.txt +++ b/components/heap/test/CMakeLists.txt @@ -1,3 +1,3 @@ idf_component_register(SRC_DIRS "." - INCLUDE_DIRS "." - REQUIRES unity test_utils heap) \ No newline at end of file + PRIV_INCLUDE_DIRS "." + PRIV_REQUIRES unity test_utils heap) \ No newline at end of file diff --git a/components/libsodium/test/CMakeLists.txt b/components/libsodium/test/CMakeLists.txt index 2e3a43bad..614a03f85 100644 --- a/components/libsodium/test/CMakeLists.txt +++ b/components/libsodium/test/CMakeLists.txt @@ -11,8 +11,8 @@ else() endforeach() idf_component_register(SRCS "${TEST_CASES_FILES}" "test_sodium.c" - INCLUDE_DIRS "." "${LS_TESTDIR}/../quirks" - REQUIRES unity libsodium) + PRIV_INCLUDE_DIRS "." "${LS_TESTDIR}/../quirks" + PRIV_REQUIRES unity libsodium) # 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. diff --git a/components/mbedtls/test/CMakeLists.txt b/components/mbedtls/test/CMakeLists.txt index a12b74795..b7239e84a 100644 --- a/components/mbedtls/test/CMakeLists.txt +++ b/components/mbedtls/test/CMakeLists.txt @@ -1,6 +1,6 @@ idf_component_register(SRC_DIRS "." - INCLUDE_DIRS "." - REQUIRES unity test_utils mbedtls libsodium + PRIV_INCLUDE_DIRS "." + PRIV_REQUIRES unity test_utils mbedtls libsodium EMBED_TXTFILES server_cert_chain.pem prvtkey.pem server_cert_bundle) diff --git a/components/newlib/test/CMakeLists.txt b/components/newlib/test/CMakeLists.txt index b531a1450..c11715181 100644 --- a/components/newlib/test/CMakeLists.txt +++ b/components/newlib/test/CMakeLists.txt @@ -1,3 +1,3 @@ idf_component_register(SRC_DIRS "." - INCLUDE_DIRS "." - REQUIRES unity test_utils) \ No newline at end of file + PRIV_INCLUDE_DIRS "." + PRIV_REQUIRES unity test_utils) \ No newline at end of file diff --git a/components/nvs_flash/test/CMakeLists.txt b/components/nvs_flash/test/CMakeLists.txt index 4f0d184d2..3c35870c6 100644 --- a/components/nvs_flash/test/CMakeLists.txt +++ b/components/nvs_flash/test/CMakeLists.txt @@ -1,3 +1,3 @@ idf_component_register(SRC_DIRS "." - INCLUDE_DIRS "." - REQUIRES unity test_utils nvs_flash bootloader_support) + PRIV_INCLUDE_DIRS "." + PRIV_REQUIRES unity test_utils nvs_flash bootloader_support) diff --git a/components/partition_table/test/CMakeLists.txt b/components/partition_table/test/CMakeLists.txt index b531a1450..c11715181 100644 --- a/components/partition_table/test/CMakeLists.txt +++ b/components/partition_table/test/CMakeLists.txt @@ -1,3 +1,3 @@ idf_component_register(SRC_DIRS "." - INCLUDE_DIRS "." - REQUIRES unity test_utils) \ No newline at end of file + PRIV_INCLUDE_DIRS "." + PRIV_REQUIRES unity test_utils) \ No newline at end of file diff --git a/components/perfmon/test/CMakeLists.txt b/components/perfmon/test/CMakeLists.txt index 18634e345..9e6fa3868 100644 --- a/components/perfmon/test/CMakeLists.txt +++ b/components/perfmon/test/CMakeLists.txt @@ -1,7 +1,3 @@ -set(COMPONENT_SRCDIRS - "." -) -set(COMPONENT_ADD_INCLUDEDIRS ".") -set(COMPONENT_REQUIRES unity xtensa perfmon) - -register_component() +idf_component_register(SRC_DIRS "." + PRIV_INCLUDE_DIRS "." + PRIV_REQUIRES unity xtensa perfmon) diff --git a/components/protocomm/test/CMakeLists.txt b/components/protocomm/test/CMakeLists.txt index 6e04b5332..48ba9e136 100644 --- a/components/protocomm/test/CMakeLists.txt +++ b/components/protocomm/test/CMakeLists.txt @@ -1,4 +1,4 @@ idf_component_register(SRC_DIRS "." - INCLUDE_DIRS "." + PRIV_INCLUDE_DIRS "." PRIV_INCLUDE_DIRS "../proto-c/" - REQUIRES unity mbedtls protocomm protobuf-c) \ No newline at end of file + PRIV_REQUIRES unity mbedtls protocomm protobuf-c) \ No newline at end of file diff --git a/components/pthread/test/CMakeLists.txt b/components/pthread/test/CMakeLists.txt index bb02dc7d4..652f74eb7 100644 --- a/components/pthread/test/CMakeLists.txt +++ b/components/pthread/test/CMakeLists.txt @@ -1,3 +1,3 @@ idf_component_register(SRC_DIRS "." - INCLUDE_DIRS "." - REQUIRES unity test_utils pthread) \ No newline at end of file + PRIV_INCLUDE_DIRS "." + PRIV_REQUIRES unity test_utils pthread) \ No newline at end of file diff --git a/components/sdmmc/test/CMakeLists.txt b/components/sdmmc/test/CMakeLists.txt index 01dde41ca..6c7d0e1a6 100644 --- a/components/sdmmc/test/CMakeLists.txt +++ b/components/sdmmc/test/CMakeLists.txt @@ -1,4 +1,4 @@ idf_component_register(SRC_DIRS "." - INCLUDE_DIRS "." - REQUIRES unity sdmmc + PRIV_INCLUDE_DIRS "." + PRIV_REQUIRES unity sdmmc ) \ No newline at end of file diff --git a/components/soc/test/CMakeLists.txt b/components/soc/test/CMakeLists.txt index 17353d373..096f006af 100644 --- a/components/soc/test/CMakeLists.txt +++ b/components/soc/test/CMakeLists.txt @@ -1,5 +1,5 @@ idf_build_get_property(soc_name IDF_TARGET) idf_component_register(SRC_DIRS "." - INCLUDE_DIRS "${include_dirs}" - REQUIRES unity test_utils) + PRIV_INCLUDE_DIRS "${include_dirs}" + PRIV_REQUIRES unity test_utils) diff --git a/components/spi_flash/test/CMakeLists.txt b/components/spi_flash/test/CMakeLists.txt index 5a3db1dda..820b701b6 100644 --- a/components/spi_flash/test/CMakeLists.txt +++ b/components/spi_flash/test/CMakeLists.txt @@ -4,6 +4,6 @@ endif() idf_component_register(SRC_DIRS "." EXCLUDE_SRCS "${exclude_srcs}" - INCLUDE_DIRS "." - REQUIRES unity test_utils spi_flash bootloader_support app_update) + PRIV_INCLUDE_DIRS "." + PRIV_REQUIRES unity test_utils spi_flash bootloader_support app_update) diff --git a/components/spiffs/test/CMakeLists.txt b/components/spiffs/test/CMakeLists.txt index 20bfd7a7d..3c486593d 100644 --- a/components/spiffs/test/CMakeLists.txt +++ b/components/spiffs/test/CMakeLists.txt @@ -1,3 +1,3 @@ idf_component_register(SRC_DIRS "." - INCLUDE_DIRS "." - REQUIRES unity test_utils spiffs) \ No newline at end of file + PRIV_INCLUDE_DIRS "." + PRIV_REQUIRES unity test_utils spiffs) \ No newline at end of file diff --git a/components/tcp_transport/test/CMakeLists.txt b/components/tcp_transport/test/CMakeLists.txt index 88504a27f..89846a753 100644 --- a/components/tcp_transport/test/CMakeLists.txt +++ b/components/tcp_transport/test/CMakeLists.txt @@ -1,5 +1,3 @@ -set(COMPONENT_SRCDIRS ".") -set(COMPONENT_PRIV_INCLUDEDIRS "../private_include" ".") -set(COMPONENT_PRIV_REQUIRES unity test_utils tcp_transport) - -register_component() \ No newline at end of file +idf_component_register(SRC_DIRS "." + PRIV_INCLUDE_DIRS "../private_include" "." + PRIV_REQUIRES unity test_utils tcp_transport) \ No newline at end of file diff --git a/components/ulp/test/CMakeLists.txt b/components/ulp/test/CMakeLists.txt index 78c45d4fe..4d35a94c4 100644 --- a/components/ulp/test/CMakeLists.txt +++ b/components/ulp/test/CMakeLists.txt @@ -1,7 +1,7 @@ if(IDF_TARGET STREQUAL "esp32") idf_component_register(SRC_DIRS esp32 - INCLUDE_DIRS . - REQUIRES unity ulp soc esp_common) + PRIV_INCLUDE_DIRS . + PRIV_REQUIRES unity ulp soc esp_common) set(ulp_app_name ulp_test_app) set(ulp_s_sources "ulp/test_jumps_esp32.S") diff --git a/components/vfs/test/CMakeLists.txt b/components/vfs/test/CMakeLists.txt index da9ed3c35..331489b31 100644 --- a/components/vfs/test/CMakeLists.txt +++ b/components/vfs/test/CMakeLists.txt @@ -1,3 +1,3 @@ idf_component_register(SRC_DIRS "." - INCLUDE_DIRS . - REQUIRES unity test_utils vfs fatfs spiffs) + PRIV_INCLUDE_DIRS . + PRIV_REQUIRES unity test_utils vfs fatfs spiffs) diff --git a/components/wear_levelling/test/CMakeLists.txt b/components/wear_levelling/test/CMakeLists.txt index 765f707cf..3d32791af 100644 --- a/components/wear_levelling/test/CMakeLists.txt +++ b/components/wear_levelling/test/CMakeLists.txt @@ -1,5 +1,5 @@ idf_component_register(SRC_DIRS . - INCLUDE_DIRS . - REQUIRES unity test_utils wear_levelling + PRIV_INCLUDE_DIRS . + PRIV_REQUIRES unity test_utils wear_levelling EMBED_FILES test_partition_v1.bin ) \ No newline at end of file diff --git a/components/wpa_supplicant/test/CMakeLists.txt b/components/wpa_supplicant/test/CMakeLists.txt index e64539d3e..d1099cc15 100644 --- a/components/wpa_supplicant/test/CMakeLists.txt +++ b/components/wpa_supplicant/test/CMakeLists.txt @@ -1,7 +1,7 @@ idf_component_register(SRC_DIRS "." - INCLUDE_DIRS "." "${CMAKE_CURRENT_BINARY_DIR}" + PRIV_INCLUDE_DIRS "." "${CMAKE_CURRENT_BINARY_DIR}" PRIV_INCLUDE_DIRS "../src" - REQUIRES unity esp_common test_utils wpa_supplicant mbedtls) + PRIV_REQUIRES unity esp_common test_utils wpa_supplicant mbedtls) idf_component_get_property(esp_supplicant_dir wpa_supplicant COMPONENT_DIR) diff --git a/examples/bluetooth/bluedroid/ble/ble_ancs/main/CMakeLists.txt b/examples/bluetooth/bluedroid/ble/ble_ancs/main/CMakeLists.txt index 7e64fd804..460583de9 100644 --- a/examples/bluetooth/bluedroid/ble/ble_ancs/main/CMakeLists.txt +++ b/examples/bluetooth/bluedroid/ble/ble_ancs/main/CMakeLists.txt @@ -1,5 +1,2 @@ -set(COMPONENT_SRCS "ble_ancs_demo.c" - "ble_ancs.c") -set(COMPONENT_ADD_INCLUDEDIRS ".") - -register_component() +idf_component_register(SRCS "ble_ancs_demo.c" "ble_ancs.c" + INCLUDE_DIRS ".") \ No newline at end of file diff --git a/examples/bluetooth/bluedroid/coex/gattc_gatts_coex/main/CMakeLists.txt b/examples/bluetooth/bluedroid/coex/gattc_gatts_coex/main/CMakeLists.txt index a3c8592c8..f0c3ba903 100644 --- a/examples/bluetooth/bluedroid/coex/gattc_gatts_coex/main/CMakeLists.txt +++ b/examples/bluetooth/bluedroid/coex/gattc_gatts_coex/main/CMakeLists.txt @@ -1,4 +1,2 @@ -set(COMPONENT_SRCS "gattc_gatts_coex.c") -set(COMPONENT_ADD_INCLUDEDIRS ".") - -register_component() +idf_component_register(SRCS "gattc_gatts_coex.c" + INCLUDE_DIRS ".") \ No newline at end of file diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/components/case/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/components/case/CMakeLists.txt index 97d2da4f8..b08fff231 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/components/case/CMakeLists.txt +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/components/case/CMakeLists.txt @@ -1,12 +1,11 @@ -set(COMPONENT_SRCS "ble_unit.c" +set(srcs "ble_unit.c" "run_tc.c" "sync.c" "test_env.c" "wifi_connect.c" "wifi_unit.c") -set(COMPONENT_ADD_INCLUDEDIRS .) - -set(COMPONENT_REQUIRES console nvs_flash bt) -set(SUPPORTED_TARGETS esp32) -register_component() +idf_component_register(SRCS "${srcs}" + INCLUDE_DIRS "." + REQUIRES console nvs_flash bt + REQUIRED_IDF_TARGETS esp32) diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/main/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/main/CMakeLists.txt index 44548e75f..cf4489a44 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/main/CMakeLists.txt +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/main/CMakeLists.txt @@ -1,6 +1,3 @@ -set(COMPONENT_SRCS "main.c" - "coex_cmd.c") - -set(COMPONENT_ADD_INCLUDEDIRS ".") -set(SUPPORTED_TARGETS esp32) -register_component() +idf_component_register(SRCS "main.c" "coex_cmd.c" + INCLUDE_DIRS "." + REQUIRED_IDF_TARGETS esp32) \ No newline at end of file diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/ble_mesh_node/main/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/ble_mesh_console/ble_mesh_node/main/CMakeLists.txt index 40921b35e..19c755f83 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/ble_mesh_node/main/CMakeLists.txt +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_console/ble_mesh_node/main/CMakeLists.txt @@ -1,13 +1,12 @@ -set(COMPONENT_SRCS "ble_mesh_adapter.c" - "ble_mesh_cfg_srv_model.c" - "ble_mesh_console_lib.c" - "ble_mesh_console_main.c" - "ble_mesh_console_system.c" - "ble_mesh_register_node_cmd.c" - "ble_mesh_register_server_cmd.c" - "ble_mesh_reg_gen_onoff_client_cmd.c" - "register_bluetooth.c") +set(srcs "ble_mesh_adapter.c" + "ble_mesh_cfg_srv_model.c" + "ble_mesh_console_lib.c" + "ble_mesh_console_main.c" + "ble_mesh_console_system.c" + "ble_mesh_register_node_cmd.c" + "ble_mesh_register_server_cmd.c" + "ble_mesh_reg_gen_onoff_client_cmd.c" + "register_bluetooth.c") -set(COMPONENT_ADD_INCLUDEDIRS ".") - -register_component() +idf_component_register(SRCS "${srcs}" + INCLUDE_DIRS ".") diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/ble_mesh_provisioner/main/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/ble_mesh_console/ble_mesh_provisioner/main/CMakeLists.txt index de1c6b9dd..2d387a091 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/ble_mesh_provisioner/main/CMakeLists.txt +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_console/ble_mesh_provisioner/main/CMakeLists.txt @@ -1,16 +1,15 @@ -set(COMPONENT_SRCS "ble_mesh_adapter.c" - "transaction.c" - "ble_mesh_cfg_srv_model.c" - "ble_mesh_console_lib.c" - "ble_mesh_console_main.c" - "ble_mesh_console_system.c" - "ble_mesh_reg_cfg_client_cmd.c" - "ble_mesh_reg_gen_onoff_client_cmd.c" - "ble_mesh_reg_test_perf_client_cmd.c" - "ble_mesh_register_node_cmd.c" - "ble_mesh_register_provisioner_cmd.c" - "register_bluetooth.c") +set(srcs "ble_mesh_adapter.c" + "transaction.c" + "ble_mesh_cfg_srv_model.c" + "ble_mesh_console_lib.c" + "ble_mesh_console_main.c" + "ble_mesh_console_system.c" + "ble_mesh_reg_cfg_client_cmd.c" + "ble_mesh_reg_gen_onoff_client_cmd.c" + "ble_mesh_reg_test_perf_client_cmd.c" + "ble_mesh_register_node_cmd.c" + "ble_mesh_register_provisioner_cmd.c" + "register_bluetooth.c") -set(COMPONENT_ADD_INCLUDEDIRS ".") - -register_component() +idf_component_register(SRCS "${srcs}" + INCLUDE_DIRS ".") diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_client/main/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_client/main/CMakeLists.txt index 6644ba29c..fb78c876c 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_client/main/CMakeLists.txt +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_client/main/CMakeLists.txt @@ -1,6 +1,3 @@ -set(COMPONENT_SRCS "ble_mesh_demo_main.c" - "ble_mesh_demo_init.c") - -set(COMPONENT_ADD_INCLUDEDIRS ".") - -register_component() +idf_component_register(SRCS "ble_mesh_demo_main.c" + "ble_mesh_demo_init.c" + INCLUDE_DIRS ".") diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_server/main/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_server/main/CMakeLists.txt index dc91641af..9ac8fb041 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_server/main/CMakeLists.txt +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_server/main/CMakeLists.txt @@ -1,7 +1,6 @@ -set(COMPONENT_SRCS "ble_mesh_demo_main.c" - "ble_mesh_demo_init.c" - "board.c") +set(srcs "ble_mesh_demo_main.c" + "ble_mesh_demo_init.c" + "board.c") -set(COMPONENT_ADD_INCLUDEDIRS ".") - -register_component() +idf_component_register(SRCS "${srcs}" + INCLUDE_DIRS ".") diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/components/button/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/components/button/CMakeLists.txt index 6c385ee21..73d849024 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/components/button/CMakeLists.txt +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/components/button/CMakeLists.txt @@ -1,7 +1,2 @@ - -set(COMPONENT_SRCS "button.c" - "button_obj.cpp") - -set(COMPONENT_ADD_INCLUDEDIRS ". include") - -register_component() +idf_component_register(SRCS "button.c" "button_obj.cpp" + INCLUDE_DIRS "." "include") diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/main/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/main/CMakeLists.txt index dc91641af..9ac8fb041 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/main/CMakeLists.txt +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/main/CMakeLists.txt @@ -1,7 +1,6 @@ -set(COMPONENT_SRCS "ble_mesh_demo_main.c" - "ble_mesh_demo_init.c" - "board.c") +set(srcs "ble_mesh_demo_main.c" + "ble_mesh_demo_init.c" + "board.c") -set(COMPONENT_ADD_INCLUDEDIRS ".") - -register_component() +idf_component_register(SRCS "${srcs}" + INCLUDE_DIRS ".") diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/main/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/main/CMakeLists.txt index dc91641af..f5d43fbda 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/main/CMakeLists.txt +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/main/CMakeLists.txt @@ -1,7 +1,6 @@ -set(COMPONENT_SRCS "ble_mesh_demo_main.c" - "ble_mesh_demo_init.c" - "board.c") +set(srcs "ble_mesh_demo_main.c" + "ble_mesh_demo_init.c" + "board.c") -set(COMPONENT_ADD_INCLUDEDIRS ".") - -register_component() +idf_component_register(SRCS "${srcs}" + INCLUDE_DIRS ".") diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/main/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/main/CMakeLists.txt index 6644ba29c..2189d1388 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/main/CMakeLists.txt +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/main/CMakeLists.txt @@ -1,6 +1,5 @@ -set(COMPONENT_SRCS "ble_mesh_demo_main.c" - "ble_mesh_demo_init.c") +set(srcs "ble_mesh_demo_main.c" + "ble_mesh_demo_init.c") -set(COMPONENT_ADD_INCLUDEDIRS ".") - -register_component() +idf_component_register(SRCS "${srcs}" + INCLUDE_DIRS ".") diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/components/button/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/components/button/CMakeLists.txt index 6c385ee21..13d6b0843 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/components/button/CMakeLists.txt +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/components/button/CMakeLists.txt @@ -1,7 +1,3 @@ -set(COMPONENT_SRCS "button.c" - "button_obj.cpp") - -set(COMPONENT_ADD_INCLUDEDIRS ". include") - -register_component() +idf_component_register(SRCS "button.c" "button_obj.cpp" + INCLUDE_DIRS "." "include") diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/main/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/main/CMakeLists.txt index dc91641af..9ac8fb041 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/main/CMakeLists.txt +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/main/CMakeLists.txt @@ -1,7 +1,6 @@ -set(COMPONENT_SRCS "ble_mesh_demo_main.c" - "ble_mesh_demo_init.c" - "board.c") +set(srcs "ble_mesh_demo_main.c" + "ble_mesh_demo_init.c" + "board.c") -set(COMPONENT_ADD_INCLUDEDIRS ".") - -register_component() +idf_component_register(SRCS "${srcs}" + INCLUDE_DIRS ".") diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/main/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/main/CMakeLists.txt index dc91641af..9ac8fb041 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/main/CMakeLists.txt +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/main/CMakeLists.txt @@ -1,7 +1,6 @@ -set(COMPONENT_SRCS "ble_mesh_demo_main.c" - "ble_mesh_demo_init.c" - "board.c") +set(srcs "ble_mesh_demo_main.c" + "ble_mesh_demo_init.c" + "board.c") -set(COMPONENT_ADD_INCLUDEDIRS ".") - -register_component() +idf_component_register(SRCS "${srcs}" + INCLUDE_DIRS ".") diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/components/iperf/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/components/iperf/CMakeLists.txt index 5073db6d0..aa6b0e782 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/components/iperf/CMakeLists.txt +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/components/iperf/CMakeLists.txt @@ -1,8 +1,3 @@ -set(COMPONENT_SRCS "cmd_wifi.c" - "iperf.c") - -set(COMPONENT_ADD_INCLUDEDIRS .) - -set(COMPONENT_REQUIRES lwip console) - -register_component() +idf_component_register(SRCS "cmd_wifi.c" "iperf.c" + INCLUDE_DIRS "." + REQUIRES lwip console) diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/main/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/main/CMakeLists.txt index dc91641af..9ac8fb041 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/main/CMakeLists.txt +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/main/CMakeLists.txt @@ -1,7 +1,6 @@ -set(COMPONENT_SRCS "ble_mesh_demo_main.c" - "ble_mesh_demo_init.c" - "board.c") +set(srcs "ble_mesh_demo_main.c" + "ble_mesh_demo_init.c" + "board.c") -set(COMPONENT_ADD_INCLUDEDIRS ".") - -register_component() +idf_component_register(SRCS "${srcs}" + INCLUDE_DIRS ".") diff --git a/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/CMakeLists.txt index 44699eb00..7a0082a2e 100644 --- a/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/CMakeLists.txt +++ b/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/components/CMakeLists.txt @@ -1,9 +1,7 @@ -set(COMPONENT_SRCS "esp_fast_prov_client_model.c" - "esp_fast_prov_server_model.c" - "esp_fast_prov_operation.c") +set(srcs "esp_fast_prov_client_model.c" + "esp_fast_prov_server_model.c" + "esp_fast_prov_operation.c") -set(COMPONENT_ADD_INCLUDEDIRS ".") - -set(COMPONENT_REQUIRES bt) - -register_component() +idf_component_register(SRCS "${srcs}" + INCLUDE_DIRS "." + REQUIRES bt) diff --git a/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/main/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/main/CMakeLists.txt index f475ba461..34613e8e3 100644 --- a/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/main/CMakeLists.txt +++ b/examples/bluetooth/esp_ble_mesh/common_vendor_models/fast_prov_vendor_model/main/CMakeLists.txt @@ -1,3 +1 @@ -set(COMPONENT_SRCS "main.c") - -register_component() +idf_component_register(SRCS "main.c") diff --git a/examples/bluetooth/nimble/blecent/main/CMakeLists.txt b/examples/bluetooth/nimble/blecent/main/CMakeLists.txt index 7ad90092b..7eff1870a 100644 --- a/examples/bluetooth/nimble/blecent/main/CMakeLists.txt +++ b/examples/bluetooth/nimble/blecent/main/CMakeLists.txt @@ -1,6 +1,2 @@ -set(COMPONENT_SRCS "main.c" - "misc.c" - "peer.c") -set(COMPONENT_ADD_INCLUDEDIRS ".") - -register_component() +idf_component_register(SRCS "main.c" "misc.c" "peer.c" + INCLUDE_DIRS ".") diff --git a/examples/bluetooth/nimble/blehr/main/CMakeLists.txt b/examples/bluetooth/nimble/blehr/main/CMakeLists.txt index 9c74274ab..e8a76d0b0 100644 --- a/examples/bluetooth/nimble/blehr/main/CMakeLists.txt +++ b/examples/bluetooth/nimble/blehr/main/CMakeLists.txt @@ -1,5 +1,2 @@ -set(COMPONENT_SRCS "main.c" - "gatt_svr.c") -set(COMPONENT_ADD_INCLUDEDIRS ".") - -register_component() +idf_component_register(SRCS "main.c" "gatt_svr.c" + INCLUDE_DIRS ".") diff --git a/examples/bluetooth/nimble/blemesh/main/CMakeLists.txt b/examples/bluetooth/nimble/blemesh/main/CMakeLists.txt index aea89ef0e..94176cab6 100644 --- a/examples/bluetooth/nimble/blemesh/main/CMakeLists.txt +++ b/examples/bluetooth/nimble/blemesh/main/CMakeLists.txt @@ -1,4 +1,2 @@ -set(COMPONENT_SRCS "app_mesh.c") -set(COMPONENT_ADD_INCLUDEDIRS ".") - -register_component() +idf_component_register(SRCS "app_mesh.c" + INCLUDE_DIRS ".") \ No newline at end of file diff --git a/examples/bluetooth/nimble/bleprph/main/CMakeLists.txt b/examples/bluetooth/nimble/bleprph/main/CMakeLists.txt index f57d248b3..e634d9153 100644 --- a/examples/bluetooth/nimble/bleprph/main/CMakeLists.txt +++ b/examples/bluetooth/nimble/bleprph/main/CMakeLists.txt @@ -1,7 +1,7 @@ -set(COMPONENT_SRCS "main.c" - "gatt_svr.c" - "misc.c" - "scli.c") -set(COMPONENT_ADD_INCLUDEDIRS ".") +set(srcs "main.c" + "gatt_svr.c" + "misc.c" + "scli.c") -register_component() +idf_component_register(SRCS "${srcs}" + INCLUDE_DIRS ".") diff --git a/examples/peripherals/temp_sensor_esp32s2/main/CMakeLists.txt b/examples/peripherals/temp_sensor_esp32s2/main/CMakeLists.txt index 91425ac9f..343333a55 100644 --- a/examples/peripherals/temp_sensor_esp32s2/main/CMakeLists.txt +++ b/examples/peripherals/temp_sensor_esp32s2/main/CMakeLists.txt @@ -1,4 +1,2 @@ -set(COMPONENT_SRCS "temp_sensor_main.c") -set(COMPONENT_ADD_INCLUDEDIRS ".") - -register_component() +idf_component_register(SRCS "temp_sensor_main.c" + INCLUDE_DIRS ".") diff --git a/examples/protocols/esp_local_ctrl/main/CMakeLists.txt b/examples/protocols/esp_local_ctrl/main/CMakeLists.txt index 87f57d107..143807530 100644 --- a/examples/protocols/esp_local_ctrl/main/CMakeLists.txt +++ b/examples/protocols/esp_local_ctrl/main/CMakeLists.txt @@ -1,8 +1,3 @@ -set(COMPONENT_SRCS "app_main.c" "esp_local_ctrl_service.c") -set(COMPONENT_ADD_INCLUDEDIRS ".") - -set(COMPONENT_EMBED_TXTFILES - "certs/cacert.pem" - "certs/prvtkey.pem") - -register_component() +idf_component_register(SRCS "app_main.c" "esp_local_ctrl_service.c" + INCLUDE_DIRS "." + EMBED_TXTFILES "certs/cacert.pem" "certs/prvtkey.pem") diff --git a/examples/protocols/https_x509_bundle/main/CMakeLists.txt b/examples/protocols/https_x509_bundle/main/CMakeLists.txt index 9d4ce32ca..cdc838541 100644 --- a/examples/protocols/https_x509_bundle/main/CMakeLists.txt +++ b/examples/protocols/https_x509_bundle/main/CMakeLists.txt @@ -1,4 +1,2 @@ -set(COMPONENT_SRCS "https_x509_bundle_example_main.c") -set(COMPONENT_ADD_INCLUDEDIRS ".") - -register_component() +idf_component_register(SRCS "https_x509_bundle_example_main.c" + INCLUDE_DIRS ".") \ No newline at end of file diff --git a/examples/protocols/mqtt/ssl_psk/main/CMakeLists.txt b/examples/protocols/mqtt/ssl_psk/main/CMakeLists.txt index 6b0350063..61fac40e6 100644 --- a/examples/protocols/mqtt/ssl_psk/main/CMakeLists.txt +++ b/examples/protocols/mqtt/ssl_psk/main/CMakeLists.txt @@ -1,4 +1,2 @@ -set(COMPONENT_SRCS "app_main.c") -set(COMPONENT_ADD_INCLUDEDIRS ".") - -register_component() +idf_component_register(SRCS "app_main.c" + INCLUDE_DIRS ".") diff --git a/examples/security/flash_encryption/main/CMakeLists.txt b/examples/security/flash_encryption/main/CMakeLists.txt index de12ebda7..ce00c820d 100644 --- a/examples/security/flash_encryption/main/CMakeLists.txt +++ b/examples/security/flash_encryption/main/CMakeLists.txt @@ -1,4 +1,2 @@ -set(COMPONENT_SRCS "flash_encrypt_main.c") -set(COMPONENT_ADD_INCLUDEDIRS "") - -register_component() +idf_component_register(SRCS "flash_encrypt_main.c" + INCLUDE_DIRS ".") \ No newline at end of file diff --git a/examples/system/perfmon/main/CMakeLists.txt b/examples/system/perfmon/main/CMakeLists.txt index 68711fd3e..50b773295 100644 --- a/examples/system/perfmon/main/CMakeLists.txt +++ b/examples/system/perfmon/main/CMakeLists.txt @@ -1,4 +1,2 @@ -set(COMPONENT_SRCS "perfmon_example_main.c") -set(COMPONENT_ADD_INCLUDEDIRS ".") - -register_component() +idf_component_register(SRCS "perfmon_example_main.c" + INCLUDE_DIRS ".") diff --git a/tools/test_apps/security/secure_boot/main/CMakeLists.txt b/tools/test_apps/security/secure_boot/main/CMakeLists.txt index 87f374903..9cdeffe28 100644 --- a/tools/test_apps/security/secure_boot/main/CMakeLists.txt +++ b/tools/test_apps/security/secure_boot/main/CMakeLists.txt @@ -1,4 +1,2 @@ -set(COMPONENT_SRCS "secure_boot_main.c") -set(COMPONENT_ADD_INCLUDEDIRS "") - -register_component() +idf_component_register(SRCS "secure_boot_main.c" + INCLUDE_DIRS ".") diff --git a/tools/unit-test-app/components/test_utils/test/CMakeLists.txt b/tools/unit-test-app/components/test_utils/test/CMakeLists.txt index 55553bc9a..1ad7802a8 100644 --- a/tools/unit-test-app/components/test_utils/test/CMakeLists.txt +++ b/tools/unit-test-app/components/test_utils/test/CMakeLists.txt @@ -1,3 +1,3 @@ idf_component_register(SRC_DIRS "." PRIV_INCLUDE_DIRS "." - REQUIRES unity test_utils perfmon) + PRIV_REQUIRES unity test_utils perfmon)