cmake: fix include directories to work with out-of-tree arch
Include directories for ${ARCH} is not specified correctly. Several places in Zephyr, the include directories are specified as: ${ZEPHYR_BASE}/arch/${ARCH}/include the correct line is: ${ARCH_DIR}/${ARCH}/include to correctly support out of tree archs. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
This commit is contained in:
parent
5f7cc8ded9
commit
bb3946666f
6 changed files with 6 additions and 6 deletions
|
@ -4,7 +4,7 @@ add_definitions(-D__ZEPHYR_SUPERVISOR__)
|
|||
|
||||
include_directories(
|
||||
${ZEPHYR_BASE}/kernel/include
|
||||
${ZEPHYR_BASE}/arch/${ARCH}/include
|
||||
${ARCH_DIR}/${ARCH}/include
|
||||
)
|
||||
|
||||
add_subdirectory(common)
|
||||
|
|
|
@ -63,7 +63,7 @@ target_sources_ifdef(
|
|||
|
||||
target_include_directories(kernel PRIVATE
|
||||
${ZEPHYR_BASE}/kernel/include
|
||||
${ZEPHYR_BASE}/arch/${ARCH}/include
|
||||
${ARCH_DIR}/${ARCH}/include
|
||||
)
|
||||
|
||||
add_dependencies(kernel zephyr_generated_headers)
|
||||
|
|
|
@ -30,7 +30,7 @@ endif()
|
|||
|
||||
zephyr_library_include_directories(
|
||||
${ZEPHYR_BASE}/kernel/include
|
||||
${ZEPHYR_BASE}/arch/${ARCH}/include
|
||||
${ARCH_DIR}/${ARCH}/include
|
||||
)
|
||||
|
||||
zephyr_library_link_libraries(posix_subsys)
|
||||
|
|
|
@ -46,7 +46,7 @@ endif()
|
|||
|
||||
zephyr_library_include_directories(
|
||||
${ZEPHYR_BASE}/kernel/include
|
||||
${ZEPHYR_BASE}/arch/${ARCH}/include
|
||||
${ARCH_DIR}/${ARCH}/include
|
||||
)
|
||||
|
||||
if(CONFIG_NET_SHELL)
|
||||
|
|
|
@ -41,7 +41,7 @@ endif()
|
|||
zephyr_include_directories_ifdef(
|
||||
CONFIG_TRACING
|
||||
${ZEPHYR_BASE}/kernel/include
|
||||
${ZEPHYR_BASE}/arch/${ARCH}/include
|
||||
${ARCH_DIR}/${ARCH}/include
|
||||
)
|
||||
|
||||
zephyr_include_directories_ifdef(CONFIG_TRACING include)
|
||||
|
|
|
@ -4,7 +4,7 @@ zephyr_sources(ctf_top.c)
|
|||
|
||||
zephyr_include_directories(
|
||||
${ZEPHYR_BASE}/kernel/include
|
||||
${ZEPHYR_BASE}/arch/${ARCH}/include
|
||||
${ARCH_DIR}/${ARCH}/include
|
||||
)
|
||||
|
||||
zephyr_include_directories(.)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue