Added utility function to get name symbol from string without file extension.

Author: MrPointer

cmake/Platform/Sketches/SketchHeadersManager.cmake

@@ -33,8 +33,7 @@ function(resolve_sketch_headers _target_name _board_id _sketch_file)
     foreach (header ${sketch_headers})
         # Header name without extension (such as '.h') can represent an Arduino/Platform library
         # So first we should check whether it's a library
-        string(REGEX MATCH "(.+)\\." "${header}" header_we_match)
-        set(header_we ${CMAKE_MATCH_1})
+        get_name_without_file_extension("${header}" header_we)
 
         if (${header_we} IN_LIST ARDUINO_CMAKE_PLATFORM_LIBRARIES)
             link_platform_library(${_target_name} ${header_we} ${_board_id})

cmake/Platform/Sources/SourcesManager.cmake

@@ -29,13 +29,20 @@ endfunction()
 #=============================================================================#
 function(get_source_file_included_headers _source_file _return_var)
 
+    cmake_parse_arguments(headers "WE" "" "" ${ARGN})
+
     file(STRINGS "${_source_file}" source_lines) # Loc = Lines of code
     list(FILTER source_lines INCLUDE REGEX ${ARDUINO_CMAKE_HEADER_INCLUDE_REGEX_PATTERN})
 
     # Extract header names from inclusion
     foreach (loc ${source_lines})
         string(REGEX MATCH ${ARDUINO_CMAKE_HEADER_NAME_REGEX_PATTERN} ${loc} match)
-        list(APPEND headers ${CMAKE_MATCH_1})
+        if (headers_WE)
+            get_name_without_file_extension("${CMAKE_MATCH_1}" header_name)
+        else ()
+            set(header_name ${CMAKE_MATCH_1})
+        endif ()
+        list(APPEND headers ${header_name})
     endforeach ()
 
     set(${_return_var} ${headers} PARENT_SCOPE)

cmake/Platform/System/DefaultsManager.cmake

@@ -12,6 +12,8 @@ function(set_internal_search_patterns)
             "Regex pattern matching a header's name when wrapped in inclusion line")
     set(ARDUINO_CMAKE_HEADER_FILE_EXTENSION_REGEX_PATTERN ".+\\.h.*$" CACHE STRING
             "Regex pattern matching all header file extensions")
+    set(ARDUINO_CMAKE_NAME_WE_REGEX_PATTERN "(.+)\\." CACHE STRING
+            "Regex pattern matching name without file extension")
     set(ARDUINO_CMAKE_FUNCTION_REGEX_PATTERN "^([a-z]|[A-Z])+.*\(([a-z]|[A-Z])*\)" CACHE STRING
             "Regex pattern matching a function signature in a source file")
 

cmake/Platform/Utilities/StringUtils.cmake

@@ -66,3 +66,13 @@ function(get_core_lib_target_name _board_id _return_var)
     set(${_return_var} ${core_lib_target_name} PARENT_SCOPE)
 
 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.
+#=============================================================================#
+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()