Added feature to search for library-specific sources under a directory.

It allows to find libraries that have their sources directly under the root directory (As opposed to built-in libraries that have theirs' under 'src') using the `find_arduino_library` function.

Author: MrPointer

cmake/Platform/Sources/SourceSeeker.cmake

@@ -25,6 +25,21 @@ function(_find_sources _base_path _pattern _return_var)
 
 endfunction()
 
+#=============================================================================#
+# Finds header files matching the pre-defined header-file pattern under the given path.
+# This functions searchs explicitly for header-files such as '*.h'.
+# Search could also be recursive (With sub-directories) if the optional 'RECURSE' option is passed.
+#        _base_path - Top-Directory path to search source files in.
+#        _return_var - Name of variable in parent-scope holding the return value.
+#        Returns - List of header files in the given path
+#=============================================================================#
+function(find_header_files _base_path _return_var)
+
+    _find_sources("${_base_path}" "${ARDUINO_CMAKE_HEADER_FILES_PATTERN}" headers ${ARGN})
+    set(${_return_var} "${headers}" PARENT_SCOPE)
+
+endfunction()
+
 #=============================================================================#
 # Finds source files matching the pre-defined source-file pattern under the given path.
 # This functions searchs explicitly for source-files such as '*.c'.
@@ -41,20 +56,35 @@ function(find_source_files _base_path _return_var)
 endfunction()
 
 #=============================================================================#
-# Finds header files matching the pre-defined header-file pattern under the given path.
-# This functions searchs explicitly for header-files such as '*.h'.
-# Search could also be recursive (With sub-directories) if the optional 'RECURSE' option is passed.
+# Recursively finds header files under the given path, excluding those that don't belong to a library,
+# such as files under the 'exmaples' directory (In case sources reside under lib's root directory).
 #        _base_path - Top-Directory path to search source files in.
 #        _return_var - Name of variable in parent-scope holding the return value.
-#        Returns - List of header files in the given path
+#        Returns - List of source files in the given path
 #=============================================================================#
-function(find_header_files _base_path _return_var)
+function(find_library_header_files _base_path _return_var)
 
-    _find_sources("${_base_path}" "${ARDUINO_CMAKE_HEADER_FILES_PATTERN}" headers ${ARGN})
+    find_header_files(${_base_path} headers RECURSE) # Library headers are always searched recursively
+    list(FILTER headers EXCLUDE REGEX "${ARDUINO_CMAKE_EXCLUDED_LIBRARY_SOURCES_PATTERN}")
     set(${_return_var} "${headers}" PARENT_SCOPE)
 
 endfunction()
 
+#=============================================================================#
+# Recursively finds source files under the given path, excluding those that don't belong to a library,
+# such as files under the 'exmaples' directory (In case sources reside under lib's root directory).
+#        _base_path - Top-Directory path to search source files in.
+#        _return_var - Name of variable in parent-scope holding the return value.
+#        Returns - List of source files in the given path
+#=============================================================================#
+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}")
+    set(${_return_var} "${sources}" PARENT_SCOPE)
+
+endfunction()
+
 #=============================================================================#
 # Finds sketch files matching the pre-defined sketch-file pattern under the given path.
 # This functions searchs explicitly for sketch-files such as '*.ino'.

cmake/Platform/System/DefaultsManager.cmake

@@ -30,6 +30,9 @@ 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/ArduinoLibraryTarget.cmake

@@ -124,19 +124,14 @@ function(find_arduino_library _target_name _library_name _board_id)
             endif ()
         endif ()
 
-        find_header_files("${library_path}/src" library_headers RECURSE)
-
+        find_library_header_files("${library_path}" library_headers)
         if (NOT library_headers)
-            set(error_message
-                    "${_library_name} doesn't have any header files under the 'src' directory")
+            set(error_message "Couldn't find any header files for the ${_library_name} library")
             message(SEND_ERROR "${error_message}")
         else ()
-            find_source_files("${library_path}/src" library_sources RECURSE)
-
+            find_library_source_files("${library_path}" library_sources)
             if (NOT library_sources)
-                set(error_message
-                        "${_library_name} doesn't have any source files \
-                         under the 'src' directory")
+                set(error_message "Couldn't find any source files for the ${_library_name} library")
                 message(SEND_ERROR "${error_message}")
             else ()
                 set(sources ${library_headers} ${library_sources})