Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on May 4, 2019. It is now read-only.

fixed arduino library includes #31

Merged
merged 1 commit into from
Dec 8, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions cmake/Platform/Core/Libraries/ArduinoLibraryFactory.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ function(make_arduino_library VAR_NAME BOARD_ID LIB_PATH COMPILE_FLAGS LINK_FLAG
else ()
# Target already exists, skiping creating
list(APPEND LIB_TARGETS ${TARGET_LIB_NAME})
list(APPEND LIB_INCLUDES "-I\"${LIB_PATH}\"")
endif ()

if (LIB_TARGETS)
Expand Down
8 changes: 0 additions & 8 deletions cmake/Platform/Core/LibraryFinder.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -102,20 +102,12 @@ function(find_arduino_libraries VAR_NAME SRCS ARDLIBS)
list(APPEND ARDUINO_LIBS ${LIB_SEARCH_PATH}/${INCLUDE_NAME})
break()
endif ()
if (EXISTS ${LIB_SEARCH_PATH}/${CMAKE_MATCH_1})
list(APPEND ARDUINO_LIBS ${LIB_SEARCH_PATH})
break()
endif ()

# Some libraries like Wire and SPI require building from source
if (EXISTS ${LIB_SEARCH_PATH}/${INCLUDE_NAME}/src/${CMAKE_MATCH_1})
list(APPEND ARDUINO_LIBS ${LIB_SEARCH_PATH}/${INCLUDE_NAME}/src)
break()
endif ()
if (EXISTS ${LIB_SEARCH_PATH}/src/${CMAKE_MATCH_1})
list(APPEND ARDUINO_LIBS ${LIB_SEARCH_PATH}/src)
break()
endif ()
endforeach ()

endif ()
Expand Down