Skip to content

cmake: do not download submodules when BUILD_UNIT_TESTS or CONFIG_LIBRARY #4777

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
lgirdwood merged 3 commits into from
Sep 17, 2021
Merged

cmake: do not download submodules when BUILD_UNIT_TESTS or CONFIG_LIBRARY #4777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
603687a
cmake: do not download submodules when BUILD_UNIT_TESTS
marc-hb Sep 16, 2021
3e09ebd
cmake: add the -Irimage #include path only for the modules that need it
marc-hb Sep 17, 2021
059cc67
cmake/github: do not download rimage when CONFIG_LIBRARY/testbench
marc-hb Sep 17, 2021
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
2 changes: 1 addition & 1 deletion .github/workflows/pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:

steps:
- uses: actions/checkout@v2
with: {fetch-depth: 0, submodules: recursive}
with: {fetch-depth: 5}

- name: docker
run: docker pull thesofproject/sof && docker tag thesofproject/sof sof
Expand Down
1 change: 0 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ set(CMAKE_ASM_FLAGS -DASSEMBLY)
add_library(sof_public_headers INTERFACE)

target_include_directories(sof_public_headers INTERFACE ${PROJECT_SOURCE_DIR}/src/include)
target_include_directories(sof_public_headers INTERFACE ${PROJECT_SOURCE_DIR}/rimage/src/include)

# interface library that is used only as container for sof binary options
# other targets can use it to build with the same options
Expand Down
3 changes: 2 additions & 1 deletion scripts/cmake/git-submodules.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ if(GIT_FOUND AND EXISTS "${SOF_ROOT_SOURCE_DIRECTORY}/.git")
"There are submodule changes, check git status and git diff\n${stdout}")
endif()

else()
elseif(NOT BUILD_UNIT_TESTS AND
NOT CONFIG_LIBRARY)
# Automated initialization for convenience. You can defeat it by
# manually initializing rimage and _not_ some other
# submodule. In that case you get the warning above.
Expand Down
5 changes: 5 additions & 0 deletions src/arch/xtensa/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,11 @@ if(build_bootloader)
add_dependencies(boot_module rimage_ep)
add_dependencies(base_module rimage_ep)

target_include_directories(bootloader PRIVATE ${PROJECT_SOURCE_DIR}/rimage/src/include)
target_include_directories(boot_module PRIVATE ${PROJECT_SOURCE_DIR}/rimage/src/include)
target_include_directories(base_module PRIVATE ${PROJECT_SOURCE_DIR}/rimage/src/include)


target_link_libraries(bootloader PRIVATE sof_options)
add_local_sources(bootloader xtos/_vectors.S ${PROJECT_SOURCE_DIR}/src/platform/${family_path}/boot_entry.S ${PROJECT_SOURCE_DIR}/src/platform/${family_path}/boot_loader.c)
target_link_libraries(bootloader PRIVATE reset)
Expand Down