diff options
| author | Riku Isokoski <riksu9000@gmail.com> | 2022-12-31 09:31:07 +0200 |
|---|---|---|
| committer | JF <JF002@users.noreply.github.com> | 2022-12-31 12:41:45 +0100 |
| commit | 318a243df1ad844ed487b936eb7edde876fc5ef6 (patch) | |
| tree | e6778ab26fe3f3911ba4880574fd27d346ba0888 /src | |
| parent | 419d8413c6a65c72719215b2f2f0937f35f2467f (diff) | |
Revert "prepare cmake unity build"
This reverts commit 21f3bd708261ece47096961039e65d5b6f113c73.
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 23 | ||||
| -rw-r--r-- | src/displayapp/fonts/CMakeLists.txt | 6 |
2 files changed, 0 insertions, 29 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index dca78f3e..64b7ffbd 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1157,26 +1157,3 @@ 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 45687dc1..84830cc0 100644 --- a/src/displayapp/fonts/CMakeLists.txt +++ b/src/displayapp/fonts/CMakeLists.txt @@ -32,12 +32,6 @@ 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() |