From f2c7a0db13c3caa943b672cb63a92aafdfbbc613 Mon Sep 17 00:00:00 2001 From: Riku Isokoski Date: Sat, 14 May 2022 00:45:14 +0300 Subject: [PATCH 1/2] Build widgets in widgets folder --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index b16b671..19becc5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -169,9 +169,13 @@ file(GLOB InfiniTime_FONTS file(GLOB InfiniTime_ICONS "${InfiniTime_DIR}/src/displayapp/icons/*.c" ) +file(GLOB InfiniTime_WIDGETS + "${InfiniTime_DIR}/src/displayapp/widgets/*.cpp" +) target_sources(infinisim PUBLIC ${InfiniTime_SCREENS}) target_sources(infinisim PUBLIC ${InfiniTime_FONTS}) target_sources(infinisim PUBLIC ${InfiniTime_ICONS}) +target_sources(infinisim PUBLIC ${InfiniTime_WIDGETS}) # add files directly from InfiniTime sources target_include_directories(infinisim PRIVATE "${InfiniTime_DIR}/src") From dbc25a32821c73fa3158cacc52266d8a1070bb51 Mon Sep 17 00:00:00 2001 From: NeroBurner Date: Sun, 15 May 2022 19:42:35 +0200 Subject: [PATCH 2/2] glob for .h widgets files as well --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 19becc5..b8d3047 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -171,6 +171,7 @@ file(GLOB InfiniTime_ICONS ) file(GLOB InfiniTime_WIDGETS "${InfiniTime_DIR}/src/displayapp/widgets/*.cpp" + "${InfiniTime_DIR}/src/displayapp/widgets/*.h" ) target_sources(infinisim PUBLIC ${InfiniTime_SCREENS}) target_sources(infinisim PUBLIC ${InfiniTime_FONTS})