diff options
| author | Riku Isokoski <riksu9000@gmail.com> | 2022-12-14 20:22:25 +0200 |
|---|---|---|
| committer | JF <JF002@users.noreply.github.com> | 2022-12-26 20:46:39 +0100 |
| commit | b071422f91941c6735ffcc647ff622775f1ee459 (patch) | |
| tree | 06713778daabcde67f2a7ed3636460ee7f88cc3e | |
| parent | 44ba4dd47064508f4d289b7a33197abcbbcf5c9c (diff) | |
Small fixup for cmake cleanup
| -rw-r--r-- | src/CMakeLists.txt | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 07e8ca0b..64b7ffbd 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -848,11 +848,11 @@ endif() add_subdirectory(displayapp/fonts) target_compile_options(infinitime_fonts PUBLIC - $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -Og -g3> - $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -Os> - $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -Og -g3 -fno-rtti> - $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -Os -fno-rtti> - $<$<COMPILE_LANGUAGE:ASM>: -MP -MD -x assembler-with-cpp> + ${COMMON_FLAGS} + $<$<CONFIG:DEBUG>: ${DEBUG_FLAGS}> + $<$<CONFIG:RELEASE>: ${RELEASE_FLAGS}> + $<$<COMPILE_LANGUAGE:CXX>: ${CXX_FLAGS}> + $<$<COMPILE_LANGUAGE:ASM>: ${ASM_FLAGS}> ) # NRF SDK @@ -878,8 +878,6 @@ target_compile_options(nimble PRIVATE $<$<CONFIG:RELEASE>: ${RELEASE_FLAGS}> $<$<COMPILE_LANGUAGE:CXX>: ${CXX_FLAGS}> $<$<COMPILE_LANGUAGE:ASM>: ${ASM_FLAGS}> - -Wno-unused-but-set-variable - -Wno-maybe-uninitialized ) # lvgl @@ -908,9 +906,11 @@ target_compile_definitions(QCBOR PUBLIC QCBOR_DISABLE_UNCOMMON_TAGS) target_compile_definitions(QCBOR PUBLIC USEFULBUF_CONFIG_LITTLE_ENDIAN) set_target_properties(QCBOR PROPERTIES LINKER_LANGUAGE C) target_compile_options(QCBOR PRIVATE - $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3> - $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3> - $<$<COMPILE_LANGUAGE:ASM>: -MP -MD -x assembler-with-cpp> + ${COMMON_FLAGS} + $<$<CONFIG:DEBUG>: ${DEBUG_FLAGS}> + $<$<CONFIG:RELEASE>: ${RELEASE_FLAGS}> + $<$<COMPILE_LANGUAGE:ASM>: ${ASM_FLAGS}> + -O3 ) # LITTLEFS_SRC @@ -923,7 +923,6 @@ target_compile_options(littlefs PRIVATE $<$<CONFIG:RELEASE>: ${RELEASE_FLAGS}> $<$<COMPILE_LANGUAGE:CXX>: ${CXX_FLAGS}> $<$<COMPILE_LANGUAGE:ASM>: ${ASM_FLAGS}> - -Wno-unused-function ) # Build autonomous binary (without support for bootloader) |