Skip to content
This repository was archived by the owner on Apr 17, 2023. It is now read-only.

Commit 46e496a

Browse files
committed
Fixed bug in 'Header Include' regex pattern.
Moved inline regex pattern for 'Header file extensions' into a global.
1 parent d71fff1 commit 46e496a

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

cmake/Platform/Sources/SourcesManager.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ endfunction()
5151
#=============================================================================#
5252
function(get_headers_parent_directories _sources _return_var)
5353

54-
list(FILTER _sources INCLUDE REGEX ".+\\.h.*$") # Extract header files
54+
# Extract header files
55+
list(FILTER _sources INCLUDE REGEX "${ARDUINO_CMAKE_HEADER_FILE_EXTENSION_REGEX_PATTERN}")
5556
foreach (header_source ${_sources})
5657
get_filename_component(header_parent_dir ${header_source} DIRECTORY)
5758
list(APPEND parent_dirs ${header_parent_dir})

cmake/Platform/System/DefaultsManager.cmake

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@ function(set_internal_search_patterns)
55

66
set(ARDUINO_CMAKE_SEMICOLON_REPLACEMENT "!@&#%" CACHE STRING
77
"String replacement for the semicolon char, required when treating lists as code")
8-
set(ARDUINO_CMAKE_HEADER_INCLUDE_REGEX_PATTERN "^#include[<\"]" CACHE STRING
8+
set(ARDUINO_CMAKE_HEADER_INCLUDE_REGEX_PATTERN "^#include.*[<\"]" CACHE STRING
99
"Regex pattern matching header inclusion in a source file")
10-
set(ARDUINO_CMAKE_FUNCTION_REGEX_PATTERN "^([a-z]|[A-Z])+.*\(([a-z]|[A-Z])*\)" CACHE STRING
11-
"Regex pattern matching a function signature in a source file")
1210
set(ARDUINO_CMAKE_HEADER_NAME_REGEX_PATTERN
1311
"${ARDUINO_CMAKE_HEADER_INCLUDE_REGEX_PATTERN}(.+)[>\"]$" CACHE STRING
1412
"Regex pattern matching a header's name when wrapped in inclusion line")
13+
set(ARDUINO_CMAKE_HEADER_FILE_EXTENSION_REGEX_PATTERN ".+\\.h.*$" CACHE STRING
14+
"Regex pattern matching all header file extensions")
15+
set(ARDUINO_CMAKE_FUNCTION_REGEX_PATTERN "^([a-z]|[A-Z])+.*\(([a-z]|[A-Z])*\)" CACHE STRING
16+
"Regex pattern matching a function signature in a source file")
1517

1618
endfunction()
1719

0 commit comments

Comments
 (0)