Skip to content

[nrf fromlist] cmake: support directory as argument to zephyr_library… #2634

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

Merged
merged 1 commit into from
Mar 24, 2025
Merged

[nrf fromlist] cmake: support directory as argument to zephyr_library… #2634

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 14 additions & 1 deletion cmake/modules/extensions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,9 +463,18 @@ endmacro()

# Provides amend functionality to a Zephyr library for out-of-tree usage.
#
# Usage:
# zephyr_library_amend([<dir>])
#
# When called from a Zephyr module, the corresponding zephyr library defined
# within Zephyr will be looked up.
#
# <dir>: Use '<dir>' as out-of-tree base directory from where the Zephyr
# library name shall be generated.
# <dir> can be used in cases where the structure for the library is not
# placed directly at the ZEPHYR_MODULE's root directory or for cases
# where the module integration file is located in a 'MODULE_EXT_ROOT'.
#
# Note, in order to ensure correct library when amending, the folder structure in the
# Zephyr module must resemble the structure used in Zephyr, as example:
#
Expand Down Expand Up @@ -496,7 +505,11 @@ macro(zephyr_library_amend)
message(FATAL_ERROR "Function only available for Zephyr modules.")
endif()

zephyr_library_get_current_dir_lib_name(${ZEPHYR_CURRENT_MODULE_DIR} lib_name)
if(${ARGC} EQUAL 1)
zephyr_library_get_current_dir_lib_name(${ARGV0} lib_name)
else()
zephyr_library_get_current_dir_lib_name(${ZEPHYR_CURRENT_MODULE_DIR} lib_name)
endif()

set(ZEPHYR_CURRENT_LIBRARY ${lib_name})
endmacro()
Expand Down