Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Backport v3.5-branch] cmake: modules: extension: Fix dtc file watch #74936

Merged
merged 2 commits into from
Jul 1, 2024
Merged

[Backport v3.5-branch] cmake: modules: extension: Fix dtc file watch #74936

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00e47ed
cmake: modules: extension: Fix dts file watch
nordicjm Jun 21, 2024
3dc33b6
cmake: modules: extensions: Fix dts watch file processing
nordicjm Jun 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions cmake/modules/extensions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2095,16 +2095,12 @@ function(toolchain_parse_make_rule input_file include_files)
# the element separator, so let's get the pure `;` back.
string(REPLACE "\;" ";" input_as_list ${input})

# Pop the first line and treat it specially
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)
# The file might also contain multiple files on one line if one or both of
# the file paths are short, split these up into multiple elements using regex
string(REGEX REPLACE "([^ ])[ ]([^ ])" "\\1;\\2" input_as_list "${input_as_list}")

# 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}")
# Pop the first item containing "empty_file.o:"
list(POP_FRONT input_as_list first_input_line)

# Remove whitespace before and after filename and convert to CMake path.
foreach(file ${input_as_list})
Expand Down
Loading