Skip to content

Commit 318a243

Browse files
Riksu9000JF002
authored andcommitted
Revert "prepare cmake unity build"
This reverts commit 21f3bd7.
1 parent 419d841 commit 318a243

File tree

2 files changed

+0
-29
lines changed

2 files changed

+0
-29
lines changed

src/CMakeLists.txt

-23
Original file line numberDiff line numberDiff line change
@@ -1157,26 +1157,3 @@ if(BUILD_RESOURCES)
11571157
add_subdirectory(resources)
11581158
endif()
11591159

1160-
# skip files, which currently cause problems when turning on CMake untiy build
1161-
set_source_files_properties(
1162-
"${NRF5_SDK_PATH}/integration/nrfx/legacy/nrf_drv_clock.c"
1163-
"${NRF5_SDK_PATH}/modules/nrfx/drivers/src/nrfx_saadc.c"
1164-
${CMAKE_CURRENT_SOURCE_DIR}/components/ble/AlertNotificationClient.cpp
1165-
${CMAKE_CURRENT_SOURCE_DIR}/components/ble/NavigationService.cpp
1166-
${CMAKE_CURRENT_SOURCE_DIR}/components/ble/NavigationService.cpp
1167-
${CMAKE_CURRENT_SOURCE_DIR}/displayapp/screens/settings/SettingChimes.cpp
1168-
${CMAKE_CURRENT_SOURCE_DIR}/displayapp/screens/settings/SettingDisplay.cpp
1169-
${CMAKE_CURRENT_SOURCE_DIR}/displayapp/screens/settings/SettingSetDate.cpp
1170-
${CMAKE_CURRENT_SOURCE_DIR}/displayapp/screens/settings/SettingSetTime.cpp
1171-
${CMAKE_CURRENT_SOURCE_DIR}/displayapp/screens/settings/SettingShakeThreshold.cpp
1172-
${CMAKE_CURRENT_SOURCE_DIR}/displayapp/screens/settings/SettingSteps.cpp
1173-
${CMAKE_CURRENT_SOURCE_DIR}/displayapp/screens/settings/SettingWakeUp.cpp
1174-
${CMAKE_CURRENT_SOURCE_DIR}/displayapp/screens/WatchFaceInfineat.cpp
1175-
${CMAKE_CURRENT_SOURCE_DIR}/displayapp/screens/WatchFacePineTimeStyle.cpp
1176-
${CMAKE_CURRENT_SOURCE_DIR}/libs/lvgl/src/lv_core/lv_obj.c
1177-
${CMAKE_CURRENT_SOURCE_DIR}/libs/mynewt-nimble/ext/tinycrypt/src/ecc_dh.c
1178-
PROPERTIES
1179-
SKIP_UNITY_BUILD_INCLUSION
1180-
ON
1181-
)
1182-

src/displayapp/fonts/CMakeLists.txt

-6
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,6 @@ foreach(FONT ${FONTS})
3232
add_custom_target(infinitime_fonts_${FONT}
3333
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${FONT}.c
3434
)
35-
36-
# skip files, which currently cause problems when turning on CMake untiy build
37-
set_source_files_properties(
38-
${FONT}.c PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON
39-
)
40-
4135
target_sources(infinitime_fonts PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/${FONT}.c")
4236
add_dependencies(infinitime_fonts infinitime_fonts_${FONT})
4337
endforeach()

0 commit comments

Comments
 (0)