Merge branch 'bugfix/idf4.1_compat' into 'master'

esp_hap_core: Minor changes for compilation with idf v4.1 See merge request app-frameworks/esp-homekit-sdk!22
espressif · Jun 1, 2022 · fac2032 · fac2032
2 parents 0a0ebf6 + 5ea5b7a
commit fac2032
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/components/homekit/esp_hap_core/CMakeLists.txt b/components/homekit/esp_hap_core/CMakeLists.txt
@@ -42,11 +42,17 @@ else()
 
 endif()
 
+set(priv_req libsodium esp_http_server hkdf-sha mu_srp json_generator json_parser esp_hap_platform esp_hap_apple_profiles mdns)
+# esp_timer component was introduced in v4.2
+if("${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}" VERSION_GREATER "4.1")
+    list(APPEND priv_req esp_timer)
+endif()
+
 idf_component_register(SRCS ${srcs}
                        INCLUDE_DIRS "include"
                        PRIV_INCLUDE_DIRS ${priv_includes}
                        REQUIRES
-                       PRIV_REQUIRES libsodium esp_http_server hkdf-sha mu_srp json_generator json_parser esp_hap_platform esp_hap_apple_profiles mdns esp_timer)
+                       PRIV_REQUIRES ${priv_req})
 component_compile_options(-Wno-unused-function)
 target_compile_definitions(${COMPONENT_TARGET} PRIVATE "-D MFI_VER=\"${MFI_VER}\"")
 # Added just to automatically trigger re-runs of CMake