michaelh/zephyr
1
0
Fork 0
Code Releases Activity

cmake: Set C compile features early for modules

Browse source 
If modules require C compiler features, these need to be set before
calling add_subdirectory.

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
This commit is contained in:
Pieter De Gendt 2024-05-07 15:44:30 +02:00 • committed by Carles Cufí
commit 294939a31e
1 changed files with 25 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

46
CMakeLists.txt
View file

@ -219,6 +219,26 @@ if(CONFIG_LTO)
add_link_options($<TARGET_PROPERTY:linker,lto_arguments>) add_link_options($<TARGET_PROPERTY:linker,lto_arguments>)
endif() endif()
if(CONFIG_STD_C23)
set(CSTD c2x)
elseif(CONFIG_STD_C17)
set(CSTD c17)
elseif(CONFIG_STD_C11)
set(CSTD c11)
elseif(CONFIG_STD_C99)
set(CSTD c99)
elseif(CONFIG_STD_C90)
set(CSTD c90)
else()
message(FATAL_ERROR "Unreachable code. Expected C standard to have been chosen.")
endif()
if(CONFIG_GNU_C_EXTENSIONS)
string(REPLACE "c" "gnu" CSTD "${CSTD}")
endif()
list(APPEND CMAKE_C_COMPILE_FEATURES ${compile_features_${CSTD}})
# @Intent: Obtain compiler specific flags related to C++ that are not influenced by kconfig # @Intent: Obtain compiler specific flags related to C++ that are not influenced by kconfig
zephyr_compile_options($<$<COMPILE_LANGUAGE:CXX>:$<TARGET_PROPERTY:compiler-cpp,required>>) zephyr_compile_options($<$<COMPILE_LANGUAGE:CXX>:$<TARGET_PROPERTY:compiler-cpp,required>>)
@ -956,35 +976,19 @@ if(CONFIG_USERSPACE)
set(PROCESS_GPERF ${ZEPHYR_BASE}/scripts/build/process_gperf.py) set(PROCESS_GPERF ${ZEPHYR_BASE}/scripts/build/process_gperf.py)
endif() endif()
get_property(CSTD GLOBAL PROPERTY CSTD) get_property(GLOBAL_CSTD GLOBAL PROPERTY CSTD)
if(NOT DEFINED CSTD) if(DEFINED GLOBAL_CSTD)
if(CONFIG_STD_C23)
set(CSTD c2x)
elseif(CONFIG_STD_C17)
set(CSTD c17)
elseif(CONFIG_STD_C11)
set(CSTD c11)
elseif(CONFIG_STD_C99)
set(CSTD c99)
elseif(CONFIG_STD_C90)
set(CSTD c90)
else()
message(FATAL_ERROR "Unreachable code. Expected C standard to have been chosen.")
endif()
if(CONFIG_GNU_C_EXTENSIONS)
string(REPLACE "c" "gnu" CSTD "${CSTD}")
endif()
else()
message(DEPRECATION message(DEPRECATION
"Global CSTD property is deprecated, see Kconfig.zephyr for C Standard options.") "Global CSTD property is deprecated, see Kconfig.zephyr for C Standard options.")
set(CSTD ${GLOBAL_CSTD})
list(APPEND CMAKE_C_COMPILE_FEATURES ${compile_features_${CSTD}})
endif() endif()
# @Intent: Obtain compiler specific flag for specifying the c standard # @Intent: Obtain compiler specific flag for specifying the c standard
zephyr_compile_options( zephyr_compile_options(
$<$<COMPILE_LANGUAGE:C>:$<TARGET_PROPERTY:compiler,cstd>${CSTD}> $<$<COMPILE_LANGUAGE:C>:$<TARGET_PROPERTY:compiler,cstd>${CSTD}>
) )
set(CMAKE_C_COMPILE_FEATURES ${compile_features_${CSTD}} PARENT_SCOPE) set(CMAKE_C_COMPILE_FEATURES ${CMAKE_C_COMPILE_FEATURES} PARENT_SCOPE)
# @Intent: Configure linker scripts, i.e. generate linker scripts with variables substituted # @Intent: Configure linker scripts, i.e. generate linker scripts with variables substituted
toolchain_ld_configure_files() toolchain_ld_configure_files()