Skip to content

zephyr/CMakeLists.txt: remove '..' in include paths #7428

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
kv2019i merged 2 commits into from
Apr 24, 2023
Merged

zephyr/CMakeLists.txt: remove '..' in include paths #7428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36bdf24
zephyr/CMakeLists.txt: remove '..' in include paths
marc-hb Apr 11, 2023
894a948
xtensa-build-zephyr.py: change help for -d, just say it like it is
marc-hb Apr 10, 2023
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 scripts/xtensa-build-zephyr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ def parse_args():
parser.add_argument("platforms", nargs="*", action=validate_platforms_arguments,
help="List of platforms to build")
parser.add_argument("-d", "--debug", required=False, action="store_true",
help="Enable debug build")
help="Shortcut for: -o sof/app/debug_overlay.conf")
parser.add_argument("-i", "--ipc", required=False, choices=["IPC4"],
help="""Applies --overlay <platform>/ipc4_overlay.conf
and a different rimage config. Valid only for IPC3 platforms supporting IPC4 too.""")
Expand Down
15 changes: 8 additions & 7 deletions zephyr/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ endfunction()
zephyr_interface_library_named(SOF)

# SOF source paths.
set(SOF_SRC_PATH "../src")
cmake_path(SET sof_top_dir NORMALIZE "${CMAKE_CURRENT_SOURCE_DIR}/..")
set(SOF_SRC_PATH "${sof_top_dir}/src")
set(SOF_PLATFORM_PATH "${SOF_SRC_PATH}/platform")
set(SOF_AUDIO_PATH "${SOF_SRC_PATH}/audio")
set(SOF_AUDIO_MODULES_PATH "${SOF_SRC_PATH}/audio/module_adapter/module")
Expand Down Expand Up @@ -86,18 +87,18 @@ ExternalProject_Add(sof_logger_ep
)

# default SOF includes
target_include_directories(SOF INTERFACE ../rimage/src/include)
target_include_directories(SOF INTERFACE ${sof_top_dir}/rimage/src/include)
target_include_directories(SOF INTERFACE ${SOF_SRC_PATH}/include)
target_include_directories(SOF INTERFACE ${SOF_SRC_PATH}/arch/${ARCH}/include)
target_include_directories(SOF INTERFACE ${SOF_SRC_PATH}/../third_party/include)
target_include_directories(SOF INTERFACE ${sof_top_dir}/third_party/include)

# TODO: Zephyr should not need xtos headers: FIX.
if (CONFIG_SOF_ZEPHYR_STRICT_HEADERS)
target_include_directories(SOF INTERFACE ${SOF_SRC_PATH}/../zephyr/include)
target_include_directories(SOF INTERFACE ${sof_top_dir}/zephyr/include)
else()
# include Zephyr before xtos to flag up any errors in SOF
target_include_directories(SOF INTERFACE ${SOF_SRC_PATH}/../zephyr/include)
target_include_directories(SOF INTERFACE ${SOF_SRC_PATH}/../xtos/include)
target_include_directories(SOF INTERFACE ${sof_top_dir}/zephyr/include)
target_include_directories(SOF INTERFACE ${sof_top_dir}/xtos/include)
endif()

# SOF module init
Expand Down Expand Up @@ -705,7 +706,7 @@ zephyr_library_link_libraries(SOF)
target_link_libraries(SOF INTERFACE zephyr_interface)

# Setup SOF directories
set(SOF_ROOT_SOURCE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/..)
set(SOF_ROOT_SOURCE_DIRECTORY ${sof_top_dir})
set(SOF_ROOT_BINARY_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})

# This generated/ directory is shared with Zephyr.
Expand Down