michaelh/zephyr
1
0
Fork 0
Code Releases Activity

cmake: modules: extensions: Fix dts watch file processing

Browse source 
Fixes and simplifies the handling of how the dts watch file is
processed

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
This commit is contained in:
Jamie McCrae 2024-06-21 11:41:49 +01:00 • committed by Anas Nashif
commit 11c1f3de61
1 changed files with 1 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cmake/modules/extensions.cmake
View file

@ -2356,16 +2356,8 @@ function(toolchain_parse_make_rule input_file include_files)
# the file paths are short, split these up into multiple elements using regex # the file paths are short, split these up into multiple elements using regex
string(REGEX REPLACE "([^ ])[ ]([^ ])" "\\1;\\2" input_as_list "${input_as_list}") string(REGEX REPLACE "([^ ])[ ]([^ ])" "\\1;\\2" input_as_list "${input_as_list}")
# Pop the first line and treat it specially # Pop the first item containing "empty_file.o:"
list(POP_FRONT input_as_list first_input_line) list(POP_FRONT input_as_list first_input_line)
string(FIND ${first_input_line} ": " index)
math(EXPR j "${index} + 2")
string(SUBSTRING ${first_input_line} ${j} -1 first_include_file)
# Remove whitespace before and after filename and convert to CMake path.
string(STRIP "${first_include_file}" first_include_file)
file(TO_CMAKE_PATH "${first_include_file}" first_include_file)
set(result "${first_include_file}")
# Remove whitespace before and after filename and convert to CMake path. # Remove whitespace before and after filename and convert to CMake path.
foreach(file ${input_as_list}) foreach(file ${input_as_list})