patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

cmake: Port Zephyr to use zephyr_check_compiler_flag

Browse source 
This commit ports nearly all usage of check_c_compiler_flag,
check_cxx_compiler_flag, and check_compiler_flag to use
zephyr_check_compiler_flag instead.

This has a significant CMake configure-time performance impact.

Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
This commit is contained in:
Sebastian Bøe 2018-04-17 15:08:58 +02:00 committed by Carles Cufí
parent 84475810ec
commit 71b849f18c
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -1089,7 +1089,7 @@ if(CONFIG_OUTPUT_PRINT_MEMORY_USAGE)
set(SAVED_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS}) set(SAVED_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${option}") set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${option}")
check_c_compiler_flag("" ${check}) zephyr_check_compiler_flag(C "" ${check})
set(CMAKE_REQUIRED_FLAGS ${SAVED_CMAKE_REQUIRED_FLAGS}) set(CMAKE_REQUIRED_FLAGS ${SAVED_CMAKE_REQUIRED_FLAGS})
target_link_libraries_ifdef(${check} zephyr_prebuilt ${option}) target_link_libraries_ifdef(${check} zephyr_prebuilt ${option})

8
cmake/extensions.cmake
View file

@ -466,7 +466,7 @@ endfunction()
function(zephyr_library_cc_option) function(zephyr_library_cc_option)
foreach(option ${ARGV}) foreach(option ${ARGV})
string(MAKE_C_IDENTIFIER check${option} check) string(MAKE_C_IDENTIFIER check${option} check)
check_c_compiler_flag(${option} ${check}) zephyr_check_compiler_flag(C ${option} ${check})
if(${check}) if(${check})
zephyr_library_compile_options(${option}) zephyr_library_compile_options(${option})
@ -971,7 +971,7 @@ function(target_cc_option_fallback target scope option1 option2)
foreach(lang C CXX) foreach(lang C CXX)
# For now, we assume that all flags that apply to C/CXX also # For now, we assume that all flags that apply to C/CXX also
# apply to ASM. # apply to ASM.
check_compiler_flag(${lang} ${option1} check) zephyr_check_compiler_flag(${lang} ${option1} check)
if(${check}) if(${check})
target_compile_options(${target} ${scope} target_compile_options(${target} ${scope}
$<$<COMPILE_LANGUAGE:${lang}>:${option1}> $<$<COMPILE_LANGUAGE:${lang}>:${option1}>
@ -985,7 +985,7 @@ function(target_cc_option_fallback target scope option1 option2)
endif() endif()
endforeach() endforeach()
else() else()
check_compiler_flag(C ${option1} check) zephyr_check_compiler_flag(C ${option1} check)
if(${check}) if(${check})
target_compile_options(${target} ${scope} ${option1}) target_compile_options(${target} ${scope} ${option1})
elseif(option2) elseif(option2)
@ -1000,7 +1000,7 @@ function(target_ld_options target scope)
set(SAVED_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS}) set(SAVED_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${option}") set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${option}")
check_c_compiler_flag("" ${check}) zephyr_check_compiler_flag(C "" ${check})
set(CMAKE_REQUIRED_FLAGS ${SAVED_CMAKE_REQUIRED_FLAGS}) set(CMAKE_REQUIRED_FLAGS ${SAVED_CMAKE_REQUIRED_FLAGS})
target_link_libraries_ifdef(${check} ${target} ${scope} ${option}) target_link_libraries_ifdef(${check} ${target} ${scope} ${option})