From 987a69f544e6ff6a90fb462f2aaee36772b92c6b Mon Sep 17 00:00:00 2001 From: Jeff Date: Sun, 6 Oct 2024 17:16:48 -0700 Subject: [PATCH] Fix check for arduino component (#204) --- CMakeLists.txt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 516e80f..055e5d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,11 +14,18 @@ elseif("nimble" IN_LIST BUILD_COMPONENTS OR "__nimble" IN_LIST __hack_component_ ) endif() -if("arduino" IN_LIST BUILD_COMPONENTS OR __hack_component_targets MATCHES "__idf_arduino") +# Arduino install using IDF component manager +if("espressif__arduino-esp32" IN_LIST BUILD_COMPONENTS OR "___idf_espressif__arduino-esp32" IN_LIST __hack_component_targets) + list(APPEND ESP_NIMBLE_PRIV_REQUIRES + arduino-esp32 + ) +# Manual installation of Arduino framework +elseif("arduino" IN_LIST BUILD_COMPONENTS OR "__idf_arduino" IN_LIST __hack_component_targets) list(APPEND ESP_NIMBLE_PRIV_REQUIRES arduino ) -elseif("framework-arduinoespressif32" IN_LIST BUILD_COMPONENTS OR __hack_component_targets MATCHES "___idf_framework-arduinoespressif32") +# PlatformIO +elseif("framework-arduinoespressif32" IN_LIST BUILD_COMPONENTS OR "___idf_framework-arduinoespressif32" IN_LIST __hack_component_targets) list(APPEND ESP_NIMBLE_PRIV_REQUIRES framework-arduinoespressif32 )