Skip to content

[nrf fromlist] cmake: fix Zephyr module ext order #2697

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
Apr 2, 2025
Merged

[nrf fromlist] cmake: fix Zephyr module ext order #2697

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
10 changes: 5 additions & 5 deletions cmake/modules/zephyr_module.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,6 @@ if(WEST OR ZEPHYR_MODULES)
endforeach()
endif()

# Append ZEPHYR_BASE as a default ext root at lowest priority
list(APPEND MODULE_EXT_ROOT ${ZEPHYR_BASE})

if(EXISTS ${cmake_modules_file})
file(STRINGS ${cmake_modules_file} zephyr_modules_txt ENCODING UTF-8)
endif()
Expand All @@ -114,9 +111,12 @@ if(WEST OR ZEPHYR_MODULES)
list(APPEND SYSBUILD_MODULE_NAMES ${module_name})
endforeach()

# Prepend ZEPHYR_BASE as a default ext root at lowest priority
list(PREPEND MODULE_EXT_ROOT ${ZEPHYR_BASE})

# MODULE_EXT_ROOT is process order which means Zephyr module roots processed
# later wins. therefore we reverse the list before processing.
list(REVERSE MODULE_EXT_ROOT)
# later wins. Thus processing Zephyr first, and modules thereafter allows them
# to overrule default glue folder settings provided by higher level modules.cmake.
foreach(root ${MODULE_EXT_ROOT})
set(module_cmake_file_path modules/modules.cmake)
if(NOT EXISTS ${root}/${module_cmake_file_path})
Expand Down