Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

User application selection with CMake #134

Merged
merged 1 commit into from
Dec 23, 2023
Merged

User application selection with CMake #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,13 @@ if(EXISTS ${InfiniTime_DIR}/src/displayapp/fonts/CMakeLists.txt)
target_link_libraries(infinisim PRIVATE infinitime_fonts)
endif()

if(EXISTS ${InfiniTime_DIR}/src/displayapp/apps/CMakeLists.txt)
# available since https://github.com/InfiniTimeOrg/InfiniTime/pull/1928
message(STATUS "add subdirectory ${InfiniTime_DIR}/src/displayapp/apps for 'infinitime_apps' target")
add_subdirectory(${InfiniTime_DIR}/src/displayapp/apps displayapp/apps)
target_link_libraries(infinisim PRIVATE infinitime_apps)
endif()

option(BUILD_RESOURCES "Generate a resource.zip file to install to spi.raw file" ON)
if(BUILD_RESOURCES)
if(EXISTS ${InfiniTime_DIR}/src/resources/CMakeLists.txt)
Expand Down
2 changes: 1 addition & 1 deletion InfiniTime
Open in desktop
Submodule InfiniTime updated 26 files
+0 −2 CMakeLists.txt
+9 −0 doc/code/Apps.md
+8 −6 src/CMakeLists.txt
+1 −1 src/components/settings/Settings.h
+1 −1 src/displayapp/DisplayApp.h
+1 −1 src/displayapp/DisplayAppRecovery.h
+1 −1 src/displayapp/UserApps.h
+2 −17 src/displayapp/apps/Apps.h.in
+12 −0 src/displayapp/apps/CMakeLists.txt
+1 −1 src/displayapp/screens/Alarm.h
+1 −1 src/displayapp/screens/ApplicationList.h
+1 −1 src/displayapp/screens/CheckboxList.h
+1 −1 src/displayapp/screens/InfiniPaint.h
+1 −1 src/displayapp/screens/List.h
+1 −1 src/displayapp/screens/Motion.h
+1 −1 src/displayapp/screens/Music.h
+1 −1 src/displayapp/screens/Navigation.h
+1 −1 src/displayapp/screens/Paddle.h
+1 −1 src/displayapp/screens/Steps.h
+1 −1 src/displayapp/screens/StopWatch.h
+1 −1 src/displayapp/screens/Tile.h
+1 −1 src/displayapp/screens/Twos.h
+1 −1 src/displayapp/screens/WatchFaceCasioStyleG7710.h
+1 −1 src/displayapp/screens/WatchFaceDigital.h
+1 −1 src/displayapp/screens/WatchFaceInfineat.h
+1 −1 src/displayapp/screens/settings/Settings.cpp
4 changes: 4 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@ The following configuration settings can be added to the first `cmake -S . -B bu
Per default InfiniSim tries to use `libpng` to create screenshots in PNG format.
This requires `libpng` development libraries as build and runtime dependency.
Can be disabled with cmake config setting `-DWITH_PNG=OFF`.
- `-DENABLE_USERAPPS`: ordered list of user applications to build into InfiniTime.
Values must be fields from the enumeration `Pinetime::Applications::Apps` and must be separated by a comma.
Ex: `-DENABLE_USERAPPS="Apps::Timer, Apps::Alarm"`.
The default list of user applications will be selected if this variable is not set.

## Run Simulator

Expand Down
Loading