scott/InfiniTime
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Revert "prepare cmake unity build"

Browse source 
This reverts commit 21f3bd7082.
This commit is contained in:
Riku Isokoski 2022-12-31 09:31:07 +02:00 committed by JF
parent 419d8413c6
commit 318a243df1
2 changed files with 0 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/CMakeLists.txt
View file

@ -1157,26 +1157,3 @@ if(BUILD_RESOURCES)
add_subdirectory(resources) add_subdirectory(resources)
endif() 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
)

6
src/displayapp/fonts/CMakeLists.txt
View file

@ -32,12 +32,6 @@ foreach(FONT ${FONTS})
add_custom_target(infinitime_fonts_${FONT} add_custom_target(infinitime_fonts_${FONT}
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${FONT}.c 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") target_sources(infinitime_fonts PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/${FONT}.c")
add_dependencies(infinitime_fonts infinitime_fonts_${FONT}) add_dependencies(infinitime_fonts infinitime_fonts_${FONT})
endforeach() endforeach()