[nrf fromlist] cmake: support directory as argument to zephyr_library… #2634
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
tejlmand
force-pushed
the
zephyr_library_amend_dir_arg
branch
from
a0a1b17 to
cdf93b3
Compare
tejlmand
force-pushed
the
zephyr_library_amend_dir_arg
branch
from
cdf93b3 to
8a36891
Compare
nordicjm
approved these changes
Mar 19, 2025
Hi-Im-David
reviewed
Mar 19, 2025
cmake/modules/extensions.cmake
Outdated
| # When called from a Zephyr module, the corresponding zephyr library defined | ||
| # within Zephyr will be looked up. | ||
| # | ||
| # <dir>: Use '<dir>' as base directory from where the Zephyr library name shall |
Contributor
There was a problem hiding this comment.
Suggested change
| # <dir>: Use '<dir>' as base directory from where the Zephyr library name shall | |
| # <dir>: Use '<dir>' as out-of-tree base directory from where the Zephyr library name shall be generated. |
Hi-Im-David
approved these changes
Mar 19, 2025
…_amend() Extend `zephyr_library_amend()` to support an optional directory argument. The current `zephyr_library_amend()` works well when used inside a Zephyr module with same structure, but fails when the macro is called from Zephyr module integration code is located in a Zephyr `MODULE_EXT_ROOT` because in this case the CMake code being executed is not present in the Zephyr module itself, in which case the dir name creation based on relative to module dir give wrong result. For this use-case then support a base directory. This also allows for use-cases in Zephyr modules where the directory structure matching Zephyr's own structure is placed in a sub-folder. Upstream PR #: 87274 Signed-off-by: Torsten Rasmussen <[email protected]>
tejlmand
force-pushed
the
zephyr_library_amend_dir_arg
branch
from
8a36891 to
1019a5b
Compare
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
…_amend().
Extend
zephyr_library_amend()to support an optional directory argument.The current
zephyr_library_amend()works well when used inside a Zephyr module with same structure, but fails when the macro is called from Zephyr module integration code is located in a ZephyrMODULE_EXT_ROOTbecause in this case the CMake code being executed is not present in the Zephyr module itself, in which case the dir name creation based on relative to module dir give wrong result.For this use-case then support a base directory.
This also allows for use-cases in Zephyr modules where the directory structure matching Zephyr's own structure is placed in a sub-folder.
Upstream PR#: 87274