Added cmake's current source dir and project dir to library search paths.

It also can search the 'libraries' and 'dependencies' sub-dirs.

Author: MrPointer

cmake/Platform/Libraries/LibrariesFinder.cmake

@@ -21,7 +21,8 @@ function(find_arduino_library _target_name _library_name _board_id)
     find_file(library_path
             NAMES ${_library_name}
             PATHS ${ARDUINO_SDK_LIBRARIES_PATH} ${ARDUINO_CMAKE_SKETCHBOOK_PATH}
-            PATH_SUFFIXES libraries
+            ${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}
+            PATH_SUFFIXES libraries dependencies
             NO_DEFAULT_PATH
             NO_CMAKE_FIND_ROOT_PATH)
 
@@ -34,6 +35,7 @@ function(find_arduino_library _target_name _library_name _board_id)
 
         if (NOT library_headers)
             message(SEND_ERROR "Couldn't find any header files for the ${_library_name} library")
+
         else ()
 
             if (parsed_args_HEADER_ONLY)
@@ -48,14 +50,19 @@ function(find_arduino_library _target_name _library_name _board_id)
                             "${_library_name} library - Is it a header-only library?"
                             "If so, please pass the HEADER_ONLY option "
                             "as an argument to the function")
+
                 else ()
+
                     set(sources ${library_headers} ${library_sources})
 
                     add_arduino_library(${_target_name} ${_board_id} ${sources})
+
                 endif ()
 
             endif ()
+
         endif ()
+
     endif ()
 
     unset(library_path CACHE)

examples/3rd-party-library/CMakeLists.txt

@@ -12,9 +12,7 @@ target_include_directories(3rd_Party_Arduino_Library PRIVATE include)
 add_arduino_library(adafruit_NeoPixel ${board_id} libraries/Adafruit_NeoPixel/Adafruit_NeoPixel.cpp)
 target_include_directories(adafruit_NeoPixel PUBLIC libraries/Adafruit_NeoPixel)
 
-# Find the "GFX" library by 'tricking' the framework to use current directory as the Sketchbook path,
-# allowing us to use the 'find' API
-set(ARDUINO_CMAKE_SKETCHBOOK_PATH "${CMAKE_CURRENT_LIST_DIR}")
+# Find the "GFX" library - It's located under the 'libraries' sub-dir, which is a valid search path
 find_arduino_library(adafruit_GFX Adafruit-GFX-Library ${board_id} 3RD_PARTY)
 # We can also explicitly add additional directories to the target,
 # as only root dir and 'src' and 'utility' sub-dirs are added by default