Modified library source-finding algorithm to match Arduino Specifications.

All sources under the 'src' sub-dir are recursively included, while all sources under library's root dir are included if 'src' sub-dir doesn't exist.
Added an example to leverage new algorithm as well as the use of Sketchbook path.
This led to some strange issues regarding linking the CoreLib to platform libraries - Still not sure what caused it and what exactly fixed it.

Author: MrPointer

cmake/Platform/Sources/SourceSeeker.cmake

@@ -64,8 +64,13 @@ endfunction()
 #=============================================================================#
 function(find_library_header_files _base_path _return_var)
 
-    find_header_files(${_base_path} headers RECURSE) # Library headers are always searched recursively
-    list(FILTER headers EXCLUDE REGEX "${ARDUINO_CMAKE_EXCLUDED_LIBRARY_SOURCES_PATTERN}")
+    if (EXISTS ${_base_path}/src) # 'src' sub-dir exists and should contain sources
+        # Headers are always searched recursively under the 'src' sub-dir
+        find_header_files(${_base_path}/src headers RECURSE)
+    else ()
+        find_header_files(${_base_path} headers)
+    endif ()
+
     set(${_return_var} "${headers}" PARENT_SCOPE)
 
 endfunction()
@@ -79,8 +84,13 @@ endfunction()
 #=============================================================================#
 function(find_library_source_files _base_path _return_var)
 
-    find_source_files(${_base_path} sources RECURSE) # Library sources are always searched recursively
-    list(FILTER sources EXCLUDE REGEX "${ARDUINO_CMAKE_EXCLUDED_LIBRARY_SOURCES_PATTERN}")
+    if (EXISTS ${_base_path}/src)
+        # Sources are always searched recursively under the 'src' sub-dir
+        find_source_files(${_base_path}/src sources RECURSE)
+    else ()
+        find_source_files(${_base_path} sources)
+    endif ()
+
     set(${_return_var} "${sources}" PARENT_SCOPE)
 
 endfunction()

cmake/Platform/System/DefaultsManager.cmake

@@ -30,9 +30,6 @@ function(set_source_files_patterns)
             "Header Files Pattern")
     set(ARDUINO_CMAKE_SKETCH_FILES_PATTERN *.ino *.pde CACHE STRING
             "Sketch Files Pattern")
-    set(ARDUINO_CMAKE_EXCLUDED_LIBRARY_SOURCES_PATTERN "examples?/.+" CACHE STRING
-            "Regex pattern matching all sources that should be excluded from search
-             when dealing with libraries")
 
 endfunction()
 

cmake/Platform/Targets/ArduinoCMakeLibraryTarget.cmake

@@ -73,7 +73,7 @@ function(_link_arduino_cmake_library _target_name _library_name)
         message(FATAL_ERROR "Target doesn't exist - It must be created first!")
     endif ()
 
-    set(scope_options "PRIVATE" "PUBLIC" "INTERFACE")
+    set(scope_options "PRIVATE" "PUBLIC" "INTERFACE" "PLATFORM_LIB")
     cmake_parse_arguments(link_library "${scope_options}" "BOARD_CORE_TARGET" "" ${ARGN})
 
     # First, include core lib's directories in library as well
@@ -85,7 +85,9 @@ function(_link_arduino_cmake_library _target_name _library_name)
 
     get_target_property(core_lib_includes ${core_target} INCLUDE_DIRECTORIES)
     target_include_directories(${_library_name} PUBLIC "${core_lib_includes}")
-    target_link_libraries(${_library_name} PUBLIC ${core_target})
+    if (NOT link_library_PLATFORM_LIB)
+        target_link_libraries(${_library_name} PUBLIC ${core_target})
+    endif ()
 
     # Now, link library to executable
     if (link_library_PUBLIC)

cmake/Platform/Targets/PlatformLibraryTarget.cmake

@@ -29,7 +29,8 @@ function(_add_platform_library _library_name _board_id)
     find_source_files("${ARDUINO_CMAKE_PLATFORM_LIBRARIES_PATH}/${_library_name}/src" lib_source_files)
     set(lib_sources ${lib_headers} ${lib_source_files})
 
-    _add_arduino_cmake_library(${_library_name} ${_board_id} "${lib_sources}")
+    _add_arduino_cmake_library(${_library_name} ${_board_id} "${lib_sources}"
+            ARCH ${ARDUINO_CMAKE_PLATFORM_ARCHITECTURE})
 
 endfunction()
 
@@ -51,7 +52,8 @@ function(link_platform_library _target_name _library_name _board_id)
 
     get_core_lib_target_name(${_board_id} core_lib_target)
     _link_arduino_cmake_library(${_target_name} ${_library_name}
-            PUBLIC
+            PUBLIC PLATFORM_LIB
             BOARD_CORE_TARGET ${core_lib_target})
+    #target_link_libraries(${_target_name} PUBLIC ${_library_name})
 
 endfunction()

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

@@ -0,0 +1,16 @@
+cmake_minimum_required(VERSION 3.8.2)
+
+project(3rd_Party_Arduino_Library LANGUAGES C CXX ASM)
+get_board_id(board_id nano atmega328)
+
+add_arduino_executable(3rd_Party_Arduino_Library ${board_id} test.cpp)
+
+add_arduino_library(Adafruit_NeoPixel ${board_id} libraries/Adafruit_NeoPixel/Adafruit_NeoPixel.cpp)
+target_include_directories(Adafruit_NeoPixel PUBLIC libraries/Adafruit_NeoPixel)
+
+# 'Trick' the framework to use current directory as Sketchbook, allowing us to use the 'find' API
+set(ARDUINO_CMAKE_SKETCHBOOK_PATH "${CMAKE_CURRENT_LIST_DIR}")
+find_arduino_library(Adafruit_GFX Adafruit-GFX-Library ${board_id} 3RD_PARTY)
+
+link_arduino_library(3rd_Party_Arduino_Library Adafruit_NeoPixel ${board_id})
+link_arduino_library(3rd_Party_Arduino_Library Adafruit_GFX ${board_id})