michaelh/zephyr
1
0
Fork 0
Code Releases Activity

cmake: Use variables for target names

Browse source 
There is an effort underway to make most of the Zephyr build script's
reentrant. Meaning, the build scripts can be executed multiple times
during the same CMake invocation.

Reentrancy enables several use-cases, the motivating one is the
ability to build several Zephyr executables, or images, for instance a
bootloader and an application.

For build scripts to be reentrant they cannot be directly referencing
global variables, like target names, but must instead reference
variables, which can vary from entry to entry.

Therefore, in this patch, we replace global targets with variables.

Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
This commit is contained in:
Sebastian Bøe 2019-01-14 16:39:33 +01:00 • committed by Anas Nashif
commit 1b86fb9da3
6 changed files with 49 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

74
CMakeLists.txt
View file

@ -30,6 +30,14 @@ assert(toolchain_is_ok "The toolchain is unable to build a dummy C file. See CMa
set(CMAKE_EXECUTABLE_SUFFIX .elf) set(CMAKE_EXECUTABLE_SUFFIX .elf)
set(ZEPHYR_PREBUILT_EXECUTABLE zephyr_prebuilt) set(ZEPHYR_PREBUILT_EXECUTABLE zephyr_prebuilt)
set(OFFSETS_H_TARGET offsets_h)
set(SYSCALL_MACROS_H_TARGET syscall_macros_h_target)
set(SYSCALL_LIST_H_TARGET syscall_list_h_target)
set(DRIVER_VALIDATION_H_TARGET driver_validation_h_target)
set(KOBJ_TYPES_H_TARGET kobj_types_h_target)
set(LINKER_SCRIPT_TARGET linker_script_target)
if(NOT PROPERTY_LINKER_SCRIPT_DEFINES) if(NOT PROPERTY_LINKER_SCRIPT_DEFINES)
set_property(GLOBAL PROPERTY PROPERTY_LINKER_SCRIPT_DEFINES -D__GCC_LINKER_CMD__) set_property(GLOBAL PROPERTY PROPERTY_LINKER_SCRIPT_DEFINES -D__GCC_LINKER_CMD__)
endif() endif()
@ -501,7 +509,7 @@ add_subdirectory(tests)
set(syscall_macros_h ${ZEPHYR_BINARY_DIR}/include/generated/syscall_macros.h) set(syscall_macros_h ${ZEPHYR_BINARY_DIR}/include/generated/syscall_macros.h)
add_custom_target(syscall_macros_h_target DEPENDS ${syscall_macros_h}) add_custom_target(${SYSCALL_MACROS_H_TARGET} DEPENDS ${syscall_macros_h})
add_custom_command( OUTPUT ${syscall_macros_h} add_custom_command( OUTPUT ${syscall_macros_h}
COMMAND COMMAND
${PYTHON_EXECUTABLE} ${PYTHON_EXECUTABLE}
@ -604,7 +612,7 @@ add_custom_command(
DEPENDS ${syscalls_subdirs_trigger} ${PARSE_SYSCALLS_HEADER_DEPENDS} DEPENDS ${syscalls_subdirs_trigger} ${PARSE_SYSCALLS_HEADER_DEPENDS}
) )
add_custom_target(syscall_list_h_target DEPENDS ${syscall_list_h}) add_custom_target(${SYSCALL_LIST_H_TARGET} DEPENDS ${syscall_list_h})
add_custom_command(OUTPUT include/generated/syscall_dispatch.c ${syscall_list_h} add_custom_command(OUTPUT include/generated/syscall_dispatch.c ${syscall_list_h}
# Also, some files are written to include/generated/syscalls/ # Also, some files are written to include/generated/syscalls/
COMMAND COMMAND
@ -628,7 +636,7 @@ add_custom_command(
$<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose> $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
) )
add_custom_target(driver_validation_h_target DEPENDS ${DRV_VALIDATION}) 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)
@ -636,17 +644,19 @@ gen_kobj(KOBJ_INCLUDE_PATH)
# 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
set(OFFSETS_LIB offsets)
set(OFFSETS_C_PATH ${ZEPHYR_BASE}/arch/${ARCH}/core/offsets/offsets.c) set(OFFSETS_C_PATH ${ZEPHYR_BASE}/arch/${ARCH}/core/offsets/offsets.c)
set(OFFSETS_O_PATH ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/offsets.dir/arch/${ARCH}/core/offsets/offsets.c.obj) set(OFFSETS_O_PATH ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${OFFSETS_LIB}.dir/arch/${ARCH}/core/offsets/offsets.c.obj)
set(OFFSETS_H_PATH ${PROJECT_BINARY_DIR}/include/generated/offsets.h) set(OFFSETS_H_PATH ${PROJECT_BINARY_DIR}/include/generated/offsets.h)
add_library( offsets STATIC ${OFFSETS_C_PATH}) add_library( ${OFFSETS_LIB} STATIC ${OFFSETS_C_PATH})
target_link_libraries(offsets zephyr_interface) target_link_libraries(${OFFSETS_LIB} zephyr_interface)
add_dependencies( offsets add_dependencies( ${OFFSETS_LIB}
syscall_list_h_target ${SYSCALL_LIST_H_TARGET}
syscall_macros_h_target ${SYSCALL_MACROS_H_TARGET}
driver_validation_h_target ${DRIVER_VALIDATION_H_TARGET}
kobj_types_h_target ${KOBJ_TYPES_H_TARGET}
) )
add_custom_command( add_custom_command(
@ -654,9 +664,9 @@ add_custom_command(
COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/gen_offset_header.py COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/scripts/gen_offset_header.py
-i ${OFFSETS_O_PATH} -i ${OFFSETS_O_PATH}
-o ${OFFSETS_H_PATH} -o ${OFFSETS_H_PATH}
DEPENDS offsets DEPENDS ${OFFSETS_LIB}
) )
add_custom_target(offsets_h DEPENDS ${OFFSETS_H_PATH}) add_custom_target(${OFFSETS_H_TARGET} DEPENDS ${OFFSETS_H_PATH})
zephyr_include_directories(${TOOLCHAIN_INCLUDES}) zephyr_include_directories(${TOOLCHAIN_INCLUDES})
@ -669,7 +679,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) add_dependencies(${zephyr_lib} ${OFFSETS_H_TARGET})
# Verify that all (non-imported) libraries have source # Verify that all (non-imported) libraries have source
# files. Libraries without source files are not supported because # files. Libraries without source files are not supported because
@ -797,16 +807,16 @@ add_custom_command(
) )
add_custom_target( add_custom_target(
linker_script ${LINKER_SCRIPT_TARGET}
DEPENDS DEPENDS
${ALIGN_SIZING_DEP} ${PRIV_STACK_DEP} ${ALIGN_SIZING_DEP} ${PRIV_STACK_DEP}
${APP_SMEM_DEP} ${APP_SMEM_DEP}
${CODE_RELOCATION_DEP} ${CODE_RELOCATION_DEP}
linker.cmd linker.cmd
offsets_h ${OFFSETS_H_TARGET}
) )
# Give the 'linker_script' target all of the include directories so # Give the '${LINKER_SCRIPT_TARGET}' target all of the include directories so
# that cmake can successfully find the linker_script's header # that cmake can successfully find the linker_script's header
# dependencies. # dependencies.
zephyr_get_include_directories_for_lang(C zephyr_get_include_directories_for_lang(C
@ -814,7 +824,7 @@ zephyr_get_include_directories_for_lang(C
STRIP_PREFIX # Don't use a -I prefix STRIP_PREFIX # Don't use a -I prefix
) )
set_property(TARGET set_property(TARGET
linker_script ${LINKER_SCRIPT_TARGET}
PROPERTY INCLUDE_DIRECTORIES PROPERTY INCLUDE_DIRECTORIES
${ZEPHYR_INCLUDE_DIRS} ${ZEPHYR_INCLUDE_DIRS}
) )
@ -1200,7 +1210,7 @@ if(CONFIG_CPU_HAS_MPU AND CONFIG_USERSPACE)
linker_app_sizing_script linker_app_sizing_script
DEPENDS DEPENDS
linker_app_sizing.cmd linker_app_sizing.cmd
offsets_h ${OFFSETS_H_TARGET}
${APP_SMEM_DEP} ${APP_SMEM_DEP}
${CODE_RELOCATION_DEP} ${CODE_RELOCATION_DEP}
) )
@ -1219,7 +1229,7 @@ if(CONFIG_CPU_HAS_MPU AND CONFIG_USERSPACE)
add_executable( app_sizing_prebuilt misc/empty_file.c) add_executable( app_sizing_prebuilt misc/empty_file.c)
target_link_libraries(app_sizing_prebuilt ${TOPT} ${PROJECT_BINARY_DIR}/linker_app_sizing.cmd ${zephyr_lnk} ${CODE_RELOCATION_DEP}) target_link_libraries(app_sizing_prebuilt ${TOPT} ${PROJECT_BINARY_DIR}/linker_app_sizing.cmd ${zephyr_lnk} ${CODE_RELOCATION_DEP})
set_property(TARGET app_sizing_prebuilt PROPERTY LINK_DEPENDS ${PROJECT_BINARY_DIR}/linker_app_sizing.cmd) set_property(TARGET app_sizing_prebuilt PROPERTY LINK_DEPENDS ${PROJECT_BINARY_DIR}/linker_app_sizing.cmd)
add_dependencies( app_sizing_prebuilt linker_app_sizing_script offsets ${CODE_RELOCATION_DEP} ) add_dependencies( app_sizing_prebuilt linker_app_sizing_script ${OFFSETS_LIB} ${CODE_RELOCATION_DEP} )
add_custom_command( add_custom_command(
TARGET app_sizing_prebuilt TARGET app_sizing_prebuilt
@ -1244,7 +1254,7 @@ if(CONFIG_ARM)
${ALIGN_SIZING_DEP} ${APP_SMEM_DEP} ${ALIGN_SIZING_DEP} ${APP_SMEM_DEP}
${CODE_RELOCATION_DEP} ${CODE_RELOCATION_DEP}
linker_priv_stacks.cmd linker_priv_stacks.cmd
offsets_h ${OFFSETS_H_TARGET}
) )
set_property(TARGET set_property(TARGET
@ -1257,7 +1267,7 @@ if(CONFIG_ARM)
add_executable( priv_stacks_prebuilt misc/empty_file.c) add_executable( priv_stacks_prebuilt misc/empty_file.c)
target_link_libraries(priv_stacks_prebuilt ${TOPT} ${PROJECT_BINARY_DIR}/linker_priv_stacks.cmd ${zephyr_lnk} ${CODE_RELOCATION_DEP}) target_link_libraries(priv_stacks_prebuilt ${TOPT} ${PROJECT_BINARY_DIR}/linker_priv_stacks.cmd ${zephyr_lnk} ${CODE_RELOCATION_DEP})
set_property(TARGET priv_stacks_prebuilt PROPERTY LINK_DEPENDS ${PROJECT_BINARY_DIR}/linker_priv_stacks.cmd) set_property(TARGET priv_stacks_prebuilt PROPERTY LINK_DEPENDS ${PROJECT_BINARY_DIR}/linker_priv_stacks.cmd)
add_dependencies( priv_stacks_prebuilt ${ALIGN_SIZING_DEP} linker_priv_stacks_script offsets) add_dependencies( priv_stacks_prebuilt ${ALIGN_SIZING_DEP} linker_priv_stacks_script ${OFFSETS_LIB})
endif() endif()
endif() endif()
@ -1266,11 +1276,12 @@ endif()
add_executable( ${ZEPHYR_PREBUILT_EXECUTABLE} misc/empty_file.c) add_executable( ${ZEPHYR_PREBUILT_EXECUTABLE} misc/empty_file.c)
target_link_libraries(${ZEPHYR_PREBUILT_EXECUTABLE} ${TOPT} ${PROJECT_BINARY_DIR}/linker.cmd ${PRIV_STACK_LIB} ${zephyr_lnk} ${CODE_RELOCATION_DEP}) target_link_libraries(${ZEPHYR_PREBUILT_EXECUTABLE} ${TOPT} ${PROJECT_BINARY_DIR}/linker.cmd ${PRIV_STACK_LIB} ${zephyr_lnk} ${CODE_RELOCATION_DEP})
set_property(TARGET ${ZEPHYR_PREBUILT_EXECUTABLE} PROPERTY LINK_DEPENDS ${PROJECT_BINARY_DIR}/linker.cmd) set_property(TARGET ${ZEPHYR_PREBUILT_EXECUTABLE} PROPERTY LINK_DEPENDS ${PROJECT_BINARY_DIR}/linker.cmd)
add_dependencies( ${ZEPHYR_PREBUILT_EXECUTABLE} ${ALIGN_SIZING_DEP} ${PRIV_STACK_DEP} linker_script offsets) add_dependencies( ${ZEPHYR_PREBUILT_EXECUTABLE} ${ALIGN_SIZING_DEP} ${PRIV_STACK_DEP} ${LINKER_SCRIPT_TARGET} ${OFFSETS_LIB})
if(GKOF OR GKSF) if(GKOF OR GKSF)
set(logical_target_for_zephyr_elf kernel_elf) set(KERNEL_ELF kernel_elf)
set(logical_target_for_zephyr_elf ${KERNEL_ELF})
# The second linker pass uses the same source linker script of the # The second linker pass uses the same source linker script of the
# first pass (LINKER_SCRIPT), but this time with a different output # first pass (LINKER_SCRIPT), but this time with a different output
@ -1280,25 +1291,26 @@ if(GKOF OR GKSF)
${custom_command} ${custom_command}
) )
set(LINKER_PASS_FINAL_SCRIPT_TARGET linker_pass_final_script_target)
add_custom_target( add_custom_target(
linker_pass_final_script ${LINKER_PASS_FINAL_SCRIPT_TARGET}
DEPENDS DEPENDS
${ALIGN_SIZING_DEP} ${PRIV_STACK_DEP} ${ALIGN_SIZING_DEP} ${PRIV_STACK_DEP}
${CODE_RELOCATION_DEP} ${CODE_RELOCATION_DEP}
${ZEPHYR_PREBUILT_EXECUTABLE} ${ZEPHYR_PREBUILT_EXECUTABLE}
linker_pass_final.cmd linker_pass_final.cmd
offsets_h ${OFFSETS_H_TARGET}
) )
set_property(TARGET set_property(TARGET
linker_pass_final_script ${LINKER_PASS_FINAL_SCRIPT_TARGET}
PROPERTY INCLUDE_DIRECTORIES PROPERTY INCLUDE_DIRECTORIES
${ZEPHYR_INCLUDE_DIRS} ${ZEPHYR_INCLUDE_DIRS}
) )
add_executable( kernel_elf misc/empty_file.c ${GKSF}) add_executable( ${KERNEL_ELF} misc/empty_file.c ${GKSF})
target_link_libraries(kernel_elf ${GKOF} ${TOPT} ${PROJECT_BINARY_DIR}/linker_pass_final.cmd ${zephyr_lnk} ${CODE_RELOCATION_DEP}) target_link_libraries(${KERNEL_ELF} ${GKOF} ${TOPT} ${PROJECT_BINARY_DIR}/linker_pass_final.cmd ${zephyr_lnk} ${CODE_RELOCATION_DEP})
set_property(TARGET kernel_elf PROPERTY LINK_DEPENDS ${PROJECT_BINARY_DIR}/linker_pass_final.cmd) set_property(TARGET ${KERNEL_ELF} PROPERTY LINK_DEPENDS ${PROJECT_BINARY_DIR}/linker_pass_final.cmd)
add_dependencies( kernel_elf ${ALIGN_SIZING_DEP} ${PRIV_STACK_DEP} linker_pass_final_script) add_dependencies( ${KERNEL_ELF} ${ALIGN_SIZING_DEP} ${PRIV_STACK_DEP} ${LINKER_PASS_FINAL_SCRIPT_TARGET})
else() else()
set(logical_target_for_zephyr_elf ${ZEPHYR_PREBUILT_EXECUTABLE}) set(logical_target_for_zephyr_elf ${ZEPHYR_PREBUILT_EXECUTABLE})
# Use the prebuilt elf as the final elf since we don't have a # Use the prebuilt elf as the final elf since we don't have a

2
cmake/kobj.cmake
View file

@ -22,7 +22,7 @@ function(gen_kobj gen_dir_out)
$<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose> $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
) )
add_custom_target(kobj_types_h_target DEPENDS ${KOBJ_TYPES} ${KOBJ_OTYPE}) add_custom_target(${KOBJ_TYPES_H_TARGET} DEPENDS ${KOBJ_TYPES} ${KOBJ_OTYPE})
set(${gen_dir_out} ${gen_dir} PARENT_SCOPE) set(${gen_dir_out} ${gen_dir} PARENT_SCOPE)

2
ext/hal/libmetal/libmetal/lib/CMakeLists.txt
View file

@ -62,7 +62,7 @@ endif (WITH_DEFAULT_LOGGER)
if (WITH_ZEPHYR) if (WITH_ZEPHYR)
zephyr_library_named(metal) zephyr_library_named(metal)
add_dependencies(metal offsets_h) add_dependencies(metal ${OFFSETS_H_TARGET})
zephyr_library_sources(${_sources}) zephyr_library_sources(${_sources})
zephyr_include_directories(${CMAKE_CURRENT_BINARY_DIR}/include) zephyr_include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
else (WITH_ZEPHYR) else (WITH_ZEPHYR)

2
ext/lib/ipc/open-amp/open-amp/lib/CMakeLists.txt
View file

@ -35,7 +35,7 @@ set_property (SOURCE ${_sources}
# Build a shared library if so configured. # Build a shared library if so configured.
if (WITH_ZEPHYR) if (WITH_ZEPHYR)
zephyr_library_named(${OPENAMP_LIB}) zephyr_library_named(${OPENAMP_LIB})
add_dependencies(${OPENAMP_LIB} offsets_h) add_dependencies(${OPENAMP_LIB} ${OFFSETS_H_TARGET})
target_sources (${OPENAMP_LIB} PRIVATE ${_sources}) target_sources (${OPENAMP_LIB} PRIVATE ${_sources})
zephyr_include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) zephyr_include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
else (WITH_ZEPHYR) else (WITH_ZEPHYR)

2
kernel/CMakeLists.txt
View file

@ -51,6 +51,6 @@ target_sources_ifdef(
) )
add_dependencies(kernel offsets_h) add_dependencies(kernel ${OFFSETS_H_TARGET})
target_link_libraries(kernel zephyr_interface) target_link_libraries(kernel zephyr_interface)

3
tests/unit/unittest.cmake
View file

@ -20,8 +20,9 @@ endif()
add_executable(testbinary ${SOURCES}) add_executable(testbinary ${SOURCES})
set(KOBJ_TYPES_H_TARGET kobj_types_h_target)
include($ENV{ZEPHYR_BASE}/cmake/kobj.cmake) include($ENV{ZEPHYR_BASE}/cmake/kobj.cmake)
add_dependencies(testbinary kobj_types_h_target) add_dependencies(testbinary ${KOBJ_TYPES_H_TARGET})
gen_kobj(KOBJ_GEN_DIR) gen_kobj(KOBJ_GEN_DIR)
list(APPEND INCLUDE list(APPEND INCLUDE