Small fixup for cmake cleanup
This commit is contained in:
parent
44ba4dd470
commit
b071422f91
|
@ -848,11 +848,11 @@ endif()
|
||||||
|
|
||||||
add_subdirectory(displayapp/fonts)
|
add_subdirectory(displayapp/fonts)
|
||||||
target_compile_options(infinitime_fonts PUBLIC
|
target_compile_options(infinitime_fonts PUBLIC
|
||||||
$<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -Og -g3>
|
${COMMON_FLAGS}
|
||||||
$<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -Os>
|
$<$<CONFIG:DEBUG>: ${DEBUG_FLAGS}>
|
||||||
$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -Og -g3 -fno-rtti>
|
$<$<CONFIG:RELEASE>: ${RELEASE_FLAGS}>
|
||||||
$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -Os -fno-rtti>
|
$<$<COMPILE_LANGUAGE:CXX>: ${CXX_FLAGS}>
|
||||||
$<$<COMPILE_LANGUAGE:ASM>: -MP -MD -x assembler-with-cpp>
|
$<$<COMPILE_LANGUAGE:ASM>: ${ASM_FLAGS}>
|
||||||
)
|
)
|
||||||
|
|
||||||
# NRF SDK
|
# NRF SDK
|
||||||
|
@ -878,8 +878,6 @@ target_compile_options(nimble PRIVATE
|
||||||
$<$<CONFIG:RELEASE>: ${RELEASE_FLAGS}>
|
$<$<CONFIG:RELEASE>: ${RELEASE_FLAGS}>
|
||||||
$<$<COMPILE_LANGUAGE:CXX>: ${CXX_FLAGS}>
|
$<$<COMPILE_LANGUAGE:CXX>: ${CXX_FLAGS}>
|
||||||
$<$<COMPILE_LANGUAGE:ASM>: ${ASM_FLAGS}>
|
$<$<COMPILE_LANGUAGE:ASM>: ${ASM_FLAGS}>
|
||||||
-Wno-unused-but-set-variable
|
|
||||||
-Wno-maybe-uninitialized
|
|
||||||
)
|
)
|
||||||
|
|
||||||
# lvgl
|
# lvgl
|
||||||
|
@ -908,9 +906,11 @@ target_compile_definitions(QCBOR PUBLIC QCBOR_DISABLE_UNCOMMON_TAGS)
|
||||||
target_compile_definitions(QCBOR PUBLIC USEFULBUF_CONFIG_LITTLE_ENDIAN)
|
target_compile_definitions(QCBOR PUBLIC USEFULBUF_CONFIG_LITTLE_ENDIAN)
|
||||||
set_target_properties(QCBOR PROPERTIES LINKER_LANGUAGE C)
|
set_target_properties(QCBOR PROPERTIES LINKER_LANGUAGE C)
|
||||||
target_compile_options(QCBOR PRIVATE
|
target_compile_options(QCBOR PRIVATE
|
||||||
$<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3>
|
${COMMON_FLAGS}
|
||||||
$<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3>
|
$<$<CONFIG:DEBUG>: ${DEBUG_FLAGS}>
|
||||||
$<$<COMPILE_LANGUAGE:ASM>: -MP -MD -x assembler-with-cpp>
|
$<$<CONFIG:RELEASE>: ${RELEASE_FLAGS}>
|
||||||
|
$<$<COMPILE_LANGUAGE:ASM>: ${ASM_FLAGS}>
|
||||||
|
-O3
|
||||||
)
|
)
|
||||||
|
|
||||||
# LITTLEFS_SRC
|
# LITTLEFS_SRC
|
||||||
|
@ -923,7 +923,6 @@ target_compile_options(littlefs PRIVATE
|
||||||
$<$<CONFIG:RELEASE>: ${RELEASE_FLAGS}>
|
$<$<CONFIG:RELEASE>: ${RELEASE_FLAGS}>
|
||||||
$<$<COMPILE_LANGUAGE:CXX>: ${CXX_FLAGS}>
|
$<$<COMPILE_LANGUAGE:CXX>: ${CXX_FLAGS}>
|
||||||
$<$<COMPILE_LANGUAGE:ASM>: ${ASM_FLAGS}>
|
$<$<COMPILE_LANGUAGE:ASM>: ${ASM_FLAGS}>
|
||||||
-Wno-unused-function
|
|
||||||
)
|
)
|
||||||
|
|
||||||
# Build autonomous binary (without support for bootloader)
|
# Build autonomous binary (without support for bootloader)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user