Fixed bug in latest utility function as well as get_source_file_included_headers, where string(REGEX) was misused.

Also refactored the feature of platform libraries retrieval from sources by using latest header-functionality additions.

Author: MrPointer

cmake/Platform/Other/ArduinoLibraryParser.cmake

@@ -1,14 +1,16 @@
-function(get_platform_libraries_from_includes _include_locs _return_var)
+#=============================================================================#
+# Retrieves all registered platform library names from the given list of names,
+# which usually resolves to names of headers included by a source file.
+#       _names - List of names that possibly contain a registered platform library's name.
+#       _return_var - Name of variable in parent-scope holding the return value.
+#       Returns - List of retrieved platform libraries names.
+#=============================================================================#
+function(get_platform_libraries_from_names _names _return_var)
 
-    set(platform_libs)
-    foreach (include ${_include_locs})
-        string(REGEX MATCH "[\"<](.+)\\." include_name ${include})
-        set(include_name "${CMAKE_MATCH_1}")
-        string(TOLOWER "${include_name}" include_name_lower)
-        if ("${include_name_lower}" IN_LIST ARDUINO_CMAKE_PLATFORM_LIBRARIES)
-            list(APPEND platform_libs "${include_name}")
-        else ()
-            continue()
+    foreach (name ${_names})
+        string(TOLOWER "${name}" name_lower)
+        if ("${name_lower}" IN_LIST ARDUINO_CMAKE_PLATFORM_LIBRARIES)
+            list(APPEND platform_libs "${name}")
         endif ()
     endforeach ()
 

cmake/Platform/Sources/SourcesManager.cmake

@@ -36,7 +36,7 @@ function(get_source_file_included_headers _source_file _return_var)
 
     # Extract header names from inclusion
     foreach (loc ${source_lines})
-        string(REGEX MATCH ${ARDUINO_CMAKE_HEADER_NAME_REGEX_PATTERN} ${loc} match)
+        string(REGEX MATCH ${ARDUINO_CMAKE_HEADER_NAME_REGEX_PATTERN} match ${loc})
         if (headers_WE)
             get_name_without_file_extension("${CMAKE_MATCH_1}" header_name)
         else ()

cmake/Platform/Targets/PlatformLibraryTarget.cmake

@@ -9,15 +9,13 @@ include(ArduinoLibraryParser)
 #=============================================================================#
 function(find_dependent_platform_libraries _sources _return_var)
 
-    set(includes)
     foreach (source ${_sources})
-        get_source_file_includes(${source} source_includes)
-        list(APPEND includes ${source_includes})
+        get_source_file_included_headers(${source} source_includes WE)
+        list(APPEND included_headers_names ${source_includes})
     endforeach ()
+    list(REMOVE_DUPLICATES included_headers_names)
 
-    list(REMOVE_DUPLICATES includes)
-
-    get_platform_libraries_from_includes("${includes}" dependent_libs)
+    get_platform_libraries_from_names("${included_headers_names}" dependent_libs)
     set(${_return_var} ${dependent_libs} PARENT_SCOPE)
 
 endfunction()

cmake/Platform/Utilities/StringUtils.cmake

@@ -70,9 +70,9 @@ endfunction()
 #=============================================================================#
 # Extracts a name symbol without possible file extension (marked usually by a dot ('.').
 #       _input_string - String containing name symbol and possibly file extension.
-#       _output_string - Name of a CMake variable that will hold the extraction result.
+#       _return_var - Name of a CMake variable that will hold the extraction result.
 #=============================================================================#
-macro(get_name_without_file_extension _input_string _output_string)
-    string(REGEX MATCH "${ARDUINO_CMAKE_NAME_WE_REGEX_PATTERN}" "${_input_string}" match)
-    set(${_output_string} ${CMAKE_MATCH_1})
-endmacro()
+function(get_name_without_file_extension _input_string _return_var)
+    string(REGEX MATCH "${ARDUINO_CMAKE_NAME_WE_REGEX_PATTERN}" match "${_input_string}")
+    set(${_return_var} ${CMAKE_MATCH_1} PARENT_SCOPE)
+endfunction()