Skip to content

Commit a5596d7

Browse files
committed
Remove __arduino_find_arduino_cli() again
This function is not consitent with the other code.
1 parent 9a94405 commit a5596d7

File tree

1 file changed

+6
-16
lines changed

1 file changed

+6
-16
lines changed

toolchain/arduino-cli-toolchain.cmake

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -459,20 +459,6 @@ endfunction()
459459
# Internal utility functions that find Arduino components and configurations.
460460
# ======================================================================================================================
461461

462-
# ----------------------------------------------------------------------------------------------------------------------
463-
# Finds the `arduini-cli` tool which is the entire toolchain file's backend.
464-
# ----------------------------------------------------------------------------------------------------------------------
465-
function(__arduino_find_arduino_cli)
466-
find_program(
467-
ARDUINO_CLI_EXECUTABLE
468-
arduino-cli REQUIRED
469-
470-
HINTS
471-
[HKLM/SOFTWARE/Arduino CLI;InstallDir]
472-
"$ENV{PROGRAMFILES}/Arduino CLI"
473-
)
474-
endfunction()
475-
476462
# ----------------------------------------------------------------------------------------------------------------------
477463
# Collects build properties for the current board from arduino-cli,
478464
# and stores them in prefixed CMake variables.
@@ -844,8 +830,12 @@ message(TRACE " from ${CMAKE_PARENT_LIST_FILE}")
844830
cmake_path(GET CMAKE_CURRENT_LIST_FILE PARENT_PATH ARDUINO_TOOLCHAIN_DIR) # <------ register "Arduino" as CMake platform
845831
list(APPEND CMAKE_MODULE_PATH ${ARDUINO_TOOLCHAIN_DIR})
846832

847-
__arduino_find_arduino_cli() # <----------------------------------------------------------- find components and settings
848-
__arduino_find_board_details(EXPANDED)
833+
find_program( # <-------------------------------------------------------------------------------------- find android-cli
834+
ARDUINO_CLI_EXECUTABLE arduino-cli REQUIRED HINTS
835+
[HKLM/SOFTWARE/Arduino CLI;InstallDir]
836+
"$ENV{PROGRAMFILES}/Arduino CLI")
837+
838+
__arduino_find_board_details(EXPANDED) # <----------------------------------- collect properties and installed libraries
849839
__arduino_find_board_details(UNEXPANDED)
850840
__arduino_find_libraries()
851841

0 commit comments

Comments
 (0)