diff options
author | tnixeu <4436784+tnixeu@users.noreply.github.com> | 2022-10-27 21:46:31 +0200 |
---|---|---|
committer | JF <JF002@users.noreply.github.com> | 2022-12-27 12:17:46 +0100 |
commit | 21f3bd708261ece47096961039e65d5b6f113c73 (patch) | |
tree | a25bf2c6dc85d3eb73b0f5ce326a5cab898240be /src | |
parent | 298f80d5049bb31f7718815dc21a24314a99b859 (diff) |
prepare cmake unity build
Exclude files from unity build which currently cause compile erros because of redefinitions.
Diffstat (limited to 'src')
-rw-r--r-- | src/CMakeLists.txt | 23 | ||||
-rw-r--r-- | src/displayapp/fonts/CMakeLists.txt | 6 |
2 files changed, 29 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 64b7ffbd..dca78f3e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1157,3 +1157,26 @@ if(BUILD_RESOURCES) add_subdirectory(resources) endif() +# skip files, which currently cause problems when turning on CMake untiy build +set_source_files_properties( + "${NRF5_SDK_PATH}/integration/nrfx/legacy/nrf_drv_clock.c" + "${NRF5_SDK_PATH}/modules/nrfx/drivers/src/nrfx_saadc.c" + ${CMAKE_CURRENT_SOURCE_DIR}/components/ble/AlertNotificationClient.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/components/ble/NavigationService.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/components/ble/NavigationService.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/displayapp/screens/settings/SettingChimes.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/displayapp/screens/settings/SettingDisplay.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/displayapp/screens/settings/SettingSetDate.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/displayapp/screens/settings/SettingSetTime.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/displayapp/screens/settings/SettingShakeThreshold.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/displayapp/screens/settings/SettingSteps.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/displayapp/screens/settings/SettingWakeUp.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/displayapp/screens/WatchFaceInfineat.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/displayapp/screens/WatchFacePineTimeStyle.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/libs/lvgl/src/lv_core/lv_obj.c + ${CMAKE_CURRENT_SOURCE_DIR}/libs/mynewt-nimble/ext/tinycrypt/src/ecc_dh.c + PROPERTIES + SKIP_UNITY_BUILD_INCLUSION + ON + ) + diff --git a/src/displayapp/fonts/CMakeLists.txt b/src/displayapp/fonts/CMakeLists.txt index 84830cc0..45687dc1 100644 --- a/src/displayapp/fonts/CMakeLists.txt +++ b/src/displayapp/fonts/CMakeLists.txt @@ -32,6 +32,12 @@ foreach(FONT ${FONTS}) add_custom_target(infinitime_fonts_${FONT} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${FONT}.c ) + +# skip files, which currently cause problems when turning on CMake untiy build + set_source_files_properties( + ${FONT}.c PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON + ) + target_sources(infinitime_fonts PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/${FONT}.c") add_dependencies(infinitime_fonts infinitime_fonts_${FONT}) endforeach() |