Skip to content

Fixed broken library discovery: header file can have another name. #57

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed broken library discovery: header file can have another name. #57

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b415c8
Improved library search: now properties ending with `architectures` a…
KOLANICH Jun 6, 2022
e58fb50
Fixed broken library discovery: header file can have another name.
KOLANICH Jun 6, 2022
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
21 changes: 14 additions & 7 deletions Arduino/System/BoardBuildTargets.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -861,8 +861,8 @@ function(_library_search_process lib search_paths_var search_suffixes_var return
# message("Folder match ${lib}:${dir}:${folder_name_priority}")

# Check for architecture match
file(STRINGS "${dir}/library.properties" arch_str REGEX "architectures=.*")
string(REGEX MATCH "architectures=(.*)" arch_list "${arch_str}")
file(STRINGS "${dir}/library.properties" arch_str REGEX "^architectures=.*")
string(REGEX MATCH "^architectures=(.*)" arch_list "${arch_str}")
string(REPLACE "," ";" arch_list "${CMAKE_MATCH_1}")
string(TOUPPER "${ARDUINO_BOARD_BUILD_ARCH}" board_arch)

Expand Down Expand Up @@ -916,11 +916,18 @@ function(_library_search_process lib search_paths_var search_suffixes_var return
endif()

# Although we got the match, let us search for the required header within the folder
file(GLOB_RECURSE lib_header_path "${matched_lib_path}/${lib}.h*")
if (NOT lib_header_path)
set ("${return_var}" "${lib}-NOTFOUND" PARENT_SCOPE)
return()
endif()
file(STRINGS "${matched_lib_path}/library.properties" incl_list REGEX "^includes=.*")
string(REGEX MATCH "^includes=(.*)" incl_list "${arch_str}")
string(REPLACE "," ";" incl_list "${CMAKE_MATCH_1}")

foreach(h ${incl_list})
file(GLOB_RECURSE lib_header_path "${matched_lib_path}/${h}.h*")
if (NOT lib_header_path)
message(STATUS "Header ${h} for ${lib} is not found.")
set ("${return_var}" "${lib}-NOTFOUND" PARENT_SCOPE)
return()
endif()
endforeach()

set ("${return_var}" "${matched_lib_path}" PARENT_SCOPE)

Expand Down