michaelh/zephyr
1
0
Fork 0
Code Releases Activity

cmake: Add target for generating header files

Browse source 
Before C sources can be compiled any generated header that they
include must be generated. Currently, the target 'offsets_h' happens
to depend directly or indirectly on all generated headers.

This means that to compile safely, one can simply depend on
'offsets_h'. But this is coincidental and might not be true in the
future.

To be able to safely depend on a target that represents all generated
headers being ready we introduce the target
'zephyr_generated_headers'.

Any third-party build scripts can now safely depend on
'zephyr_generated_headers' and be protected from any internal changes
to the build system, like the removal of offsets_h.

Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
This commit is contained in:
Sebastian Bøe 2020-01-23 15:39:17 +01:00 • committed by Kumar Gala
commit fdac7b3319
5 changed files with 25 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
CMakeLists.txt
View file

@ -626,6 +626,14 @@ add_custom_target(${DRIVER_VALIDATION_H_TARGET} DEPENDS ${DRV_VALIDATION})
include($ENV{ZEPHYR_BASE}/cmake/kobj.cmake) include($ENV{ZEPHYR_BASE}/cmake/kobj.cmake)
gen_kobj(KOBJ_INCLUDE_PATH) gen_kobj(KOBJ_INCLUDE_PATH)
# Add a pseudo-target that is up-to-date when all generated headers
# are up-to-date.
add_custom_target(zephyr_generated_headers)
add_dependencies(zephyr_generated_headers
offsets_h
)
# Generate offsets.c.obj from offsets.c # Generate offsets.c.obj from offsets.c
# Generate offsets.h from offsets.c.obj # Generate offsets.h from offsets.c.obj
@ -668,7 +676,7 @@ get_property(ZEPHYR_LIBS_PROPERTY GLOBAL PROPERTY ZEPHYR_LIBS)
foreach(zephyr_lib ${ZEPHYR_LIBS_PROPERTY}) foreach(zephyr_lib ${ZEPHYR_LIBS_PROPERTY})
# TODO: Could this become an INTERFACE property of zephyr_interface? # TODO: Could this become an INTERFACE property of zephyr_interface?
add_dependencies(${zephyr_lib} ${OFFSETS_H_TARGET}) add_dependencies(${zephyr_lib} zephyr_generated_headers)
endforeach() endforeach()
get_property(OUTPUT_FORMAT GLOBAL PROPERTY PROPERTY_OUTPUT_FORMAT) get_property(OUTPUT_FORMAT GLOBAL PROPERTY PROPERTY_OUTPUT_FORMAT)
@ -683,7 +691,7 @@ configure_linker_script(
${PRIV_STACK_DEP} ${PRIV_STACK_DEP}
${APP_SMEM_ALIGNED_DEP} ${APP_SMEM_ALIGNED_DEP}
${CODE_RELOCATION_DEP} ${CODE_RELOCATION_DEP}
${OFFSETS_H_TARGET} zephyr_generated_headers
) )
add_custom_target( add_custom_target(
@ -1088,7 +1096,7 @@ if(CONFIG_USERSPACE)
${CODE_RELOCATION_DEP} ${CODE_RELOCATION_DEP}
${APP_SMEM_UNALIGNED_DEP} ${APP_SMEM_UNALIGNED_DEP}
${APP_SMEM_UNALIGNED_LD} ${APP_SMEM_UNALIGNED_LD}
${OFFSETS_H_TARGET} zephyr_generated_headers
) )
add_custom_target( add_custom_target(
@ -1142,7 +1150,7 @@ if(CONFIG_USERSPACE AND CONFIG_ARM)
${CODE_RELOCATION_DEP} ${CODE_RELOCATION_DEP}
${APP_SMEM_ALIGNED_DEP} ${APP_SMEM_ALIGNED_DEP}
${APP_SMEM_ALIGNED_LD} ${APP_SMEM_ALIGNED_LD}
${OFFSETS_H_TARGET} zephyr_generated_headers
) )
add_custom_target( add_custom_target(
@ -1200,7 +1208,7 @@ else()
${PRIV_STACK_DEP} ${PRIV_STACK_DEP}
${CODE_RELOCATION_DEP} ${CODE_RELOCATION_DEP}
${ZEPHYR_PREBUILT_EXECUTABLE} ${ZEPHYR_PREBUILT_EXECUTABLE}
${OFFSETS_H_TARGET} zephyr_generated_headers
) )
set(LINKER_PASS_FINAL_SCRIPT_TARGET linker_pass_final_script_target) set(LINKER_PASS_FINAL_SCRIPT_TARGET linker_pass_final_script_target)

2
kernel/CMakeLists.txt
View file

@ -58,6 +58,6 @@ target_include_directories(kernel PRIVATE
${ZEPHYR_BASE}/arch/${ARCH}/include ${ZEPHYR_BASE}/arch/${ARCH}/include
) )
add_dependencies(kernel ${OFFSETS_H_TARGET}) add_dependencies(kernel zephyr_generated_headers)
target_link_libraries(kernel zephyr_interface) target_link_libraries(kernel zephyr_interface)

4
tests/subsys/settings/fs/src/CMakeLists.txt
View file

@ -6,7 +6,9 @@ zephyr_library_named(settings_test_fs)
# zephyr_library() is here in "app-mode", see # zephyr_library() is here in "app-mode", see
# https://github.com/zephyrproject-rtos/zephyr/issues/19582 # https://github.com/zephyrproject-rtos/zephyr/issues/19582
# Random build failures without this, depends on the number of threads. # Random build failures without this, depends on the number of threads.
add_dependencies( settings_test_fs offsets_h) add_dependencies(settings_test_fs
zephyr_generated_headers
)
FILE(GLOB fssources *.c ) FILE(GLOB fssources *.c )
zephyr_library_sources(${fssources}) zephyr_library_sources(${fssources})

5
tests/subsys/settings/functional/src/CMakeLists.txt
View file

@ -12,4 +12,7 @@ zephyr_library_sources(settings_basic_test.c)
# zephyr_library() is here in "app-mode", see # zephyr_library() is here in "app-mode", see
# https://github.com/zephyrproject-rtos/zephyr/issues/19582 # https://github.com/zephyrproject-rtos/zephyr/issues/19582
# Random build failures without this, depends on the number of threads. # Random build failures without this, depends on the number of threads.
add_dependencies( settings_func_test offsets_h) add_dependencies(
settings_func_test
zephyr_generated_headers
)

5
tests/subsys/settings/src/CMakeLists.txt
View file

@ -6,7 +6,10 @@ zephyr_library_named(settings_test)
# zephyr_library() is here in "app-mode", see # zephyr_library() is here in "app-mode", see
# https://github.com/zephyrproject-rtos/zephyr/issues/19582 # https://github.com/zephyrproject-rtos/zephyr/issues/19582
# Random build failures without this, depends on the number of threads. # Random build failures without this, depends on the number of threads.
add_dependencies( settings_test offsets_h) add_dependencies(
settings_test
zephyr_generated_headers
)
FILE(GLOB mysources *.c ) FILE(GLOB mysources *.c )
zephyr_library_sources(${mysources}) zephyr_library_sources(${mysources})