cmake: introduce zephyr_library_sources_amend #97548
Open
+47
−21
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nashif
force-pushed
the
topic/zephyr_library_sources_amend
branch
from
7544571 to
452247b
Compare
To be used out of tree to amend and replace sources that are implemented in Zephyr, for example drivers: zephyr_library_amend() zephyr_library_sources_amend(source.c) If source.c was already added in the library being amended, it will be replaced with the one in the west project/module. This is useful when maintaining own version of a driver that is also upstream in the Zephyr tree without having to add new configs to control compilation. Signed-off-by: Anas Nashif <[email protected]>
nashif
force-pushed
the
topic/zephyr_library_sources_amend
branch
from
452247b to
08639ea
Compare
pdgendt
reviewed
Oct 14, 2025
cmake/modules/extensions.cmake
Outdated
Comment on lines
544
to
547
| function(zephyr_library_sources_amend source) | ||
| get_target_property(CURRENT_SOURCES ${ZEPHYR_CURRENT_LIBRARY} SOURCES) | ||
| get_filename_component(sourcex ${source} NAME) | ||
| list(FIND CURRENT_SOURCES ${sourcex} _index) |
There was a problem hiding this comment.
Depending on how these source files are added to the target, they can be absolute.
Also consider some existing library
zephyr_library_sources(
subdir/sensor_x.c
)You can't amend your own sensor_x.c as it won't match with any entry in the sources list.
There was a problem hiding this comment.
Depending on how these source files are added to the target, they can be absolute.
thats why I compare with the file name component, not the full path.
There was a problem hiding this comment.
I meant for CURRENT_SOURCES.
Fix style issues with space after if. Signed-off-by: Anas Nashif <[email protected]>
nashif
force-pushed
the
topic/zephyr_library_sources_amend
branch
from
cc20022 to
71b85aa
Compare
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
To be used out of tree to amend and replace sources that are implemented
in Zephyr, for example drivers:
zephyr_library_amend()
zephyr_library_sources_amend(source.c)
If source.c was already added in the library being amended, it will be replaced
with the one in the west project/module.
This is useful when maintaining own version of a driver that is also upstream
in the Zephyr tree without having to add new configs to control compilation.
Signed-off-by: Anas Nashif [email protected]