Skip to content

fix: allow arduino-cli packages to bypass Arduino IDE requirement #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
opokatech wants to merge 1 commit into
base: release-1.1-dev
Choose a base branch
from
Open

fix: allow arduino-cli packages to bypass Arduino IDE requirement #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions Arduino/System/PackagePathIndex.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,25 @@ function(InitializeArduinoPackagePathList)
NO_CMAKE_FIND_ROOT_PATH
DOC "Path to Arduino IDE installation")
# message("ARDUINO_INSTALL_PATH:${ARDUINO_INSTALL_PATH}")

# Search for Arduino package path (do this before the IDE check so an
# existing arduino-cli installation can bypass the IDE requirement)
find_path(ARDUINO_PACKAGE_PATH
NAMES package_index.json
PATH_SUFFIXES ${package_path_suffixes}
HINTS ${package_search_paths}
NO_DEFAULT_PATH
NO_CMAKE_FIND_ROOT_PATH
DOC "Path to Arduino platform packages")
# message("ARDUINO_PACKAGE_PATH:${ARDUINO_PACKAGE_PATH}")

if (NOT ARDUINO_INSTALL_PATH AND NOT "${ARDUINO_ENABLE_PACKAGE_MANAGER}"
AND "${ARDUINO_BOARD_MANAGER_URL}" STREQUAL "")
AND "${ARDUINO_BOARD_MANAGER_URL}" STREQUAL ""
AND NOT ARDUINO_PACKAGE_PATH)
message(FATAL_ERROR "Arduino IDE installation is not found!!!\n"
"Use -DARDUINO_INSTALL_PATH=<path> to manually specify the path (OR)\n"
"Use -DARDUINO_BOARD_MANAGER_URL=<board_url> to try downloading\n")
"Use -DARDUINO_BOARD_MANAGER_URL=<board_url> to try downloading (OR)\n"
"Install packages via arduino-cli and set -DARDUINO_PACKAGE_PATH=<path>\n")
elseif(ARDUINO_INSTALL_PATH AND NOT "${ARDUINO_ENABLE_PACKAGE_MANAGER}"
AND "${ARDUINO_BOARD_MANAGER_URL}" STREQUAL "")
message("${ARDUINO_INSTALL_PATH}")
Expand All @@ -120,16 +134,6 @@ function(InitializeArduinoPackagePathList)
endif()
endif()

# Search for Arduino library path
find_path(ARDUINO_PACKAGE_PATH
NAMES package_index.json
PATH_SUFFIXES ${package_path_suffixes}
HINTS ${package_search_paths}
NO_DEFAULT_PATH
NO_CMAKE_FIND_ROOT_PATH
DOC "Path to Arduino platform packages")
# message("ARDUINO_PACKAGE_PATH:${ARDUINO_PACKAGE_PATH}")

# Search for sketchbook path
find_file(ARDUINO_PREFERENCE_FILE
NAMES preferences.txt
Expand Down