Skip to content

Sysbuild: fix annoyance with tab completion #74210

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 2 commits into from
Jun 17, 2024
Merged

Sysbuild: fix annoyance with tab completion #74210

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
720b4b7
sysbuild: set APPLICATION_BINARY_DIR to sysbuild CMake folder
tejlmand Jun 13, 2024
1bd2a07
sysbuild: move sysbuild/application to _sysbuild
tejlmand Jun 13, 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
8 changes: 6 additions & 2 deletions share/sysbuild/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,12 @@ set(Sysbuild_DIR ${CMAKE_CURRENT_LIST_DIR}/../sysbuild-package/cmake)

project(sysbuild_toplevel LANGUAGES)

if(NOT DEFINED APPLICATION_BINARY_DIR)
set(APPLICATION_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH "Application Binary Directory")
Copy link
Contributor

@57300 57300 Jun 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems alright, but I wonder if changing:

zephyr/share/zephyr-package/cmake/ZephyrConfig.cmake

Line 51 in c37e46c

set(APPLICATION_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH

to CMAKE_BINARY_DIR would've been a more general fix.

Copy link
Contributor Author

@tejlmand tejlmand Jun 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did consider that, but simply decided to go with same pattern as:

zephyr/share/zephyr-package/cmake/ZephyrConfig.cmake

Lines 50 to 54 in df788d0

if(NOT DEFINED APPLICATION_BINARY_DIR)
set(APPLICATION_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH
"Application Binary Directory"
)
endif()

In the sysbuild case, then CMAKE_CURRENT_BINARY_DIR == CMAKE_BINARY_DIR when sysbuild is invoked as documented / through west build.

endif()

if(EXISTS ${APP_DIR}/sysbuild/CMakeLists.txt)
add_subdirectory(${APP_DIR}/sysbuild sysbuild/application)
add_subdirectory(${APP_DIR}/sysbuild _sysbuild)
else()
add_subdirectory(template sysbuild/application)
add_subdirectory(template _sysbuild)
endif()