From 95dd8f1001488be6b58b9f9ad26c118c93313a7c Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Tue, 19 Apr 2022 16:54:45 +0200 Subject: [PATCH] cmake: add dependency on esp_timer component Public header file of esp-modbus (freemodbus/port/port.h) includes esp_timer.h, which is provided by esp_timer component. Currently this works without declaring a dependency on esp_timer because of a transitive dependency on esp_timer via freertos component. This will be changed in IDF v5.0, where freertos will no longer have a public dependency on esp_timer. This commit makes esp-modbus compatible with that future change. --- CMakeLists.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0f773ae..5d2a64a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,7 +59,14 @@ add_prefix(priv_include_dirs "${CMAKE_CURRENT_LIST_DIR}/freemodbus/" ${priv_incl message(STATUS "DEBUG: Use esp-modbus component folder: ${CMAKE_CURRENT_LIST_DIR}.") +set(requires driver lwip) + +# esp_timer component was introduced in v4.2 +if("${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}" VERSION_GREATER "4.1") + list(APPEND requires esp_timer) +endif() + idf_component_register(SRCS "${srcs}" INCLUDE_DIRS "${include_dirs}" PRIV_INCLUDE_DIRS "${priv_include_dirs}" - REQUIRES driver lwip) + REQUIRES ${requires})