diff options
| author | Jean-François Milants <jf@codingfield.com> | 2023-12-17 16:34:00 +0100 |
|---|---|---|
| committer | JF <JF002@users.noreply.github.com> | 2023-12-23 21:29:13 +0100 |
| commit | 2bc93184511921abda938790a4bdd1d2ea8e06ce (patch) | |
| tree | 060ddd0c7cbed07957f058c5a32dfccd3598f8e4 /src/displayapp | |
| parent | ca7d8a668d37d3377aeb38d122a9eccafdd6822d (diff) | |
CMake User Applications selection
Use CMake's configure_file() functionality to generate the list of User Applications.
All the apps included in current versions of InfiniTime are enabled by default, but this can now be overridden by setting variables ENABLE_APP_XXX to True or False.
CMake CMP0140 is set to NEW to enable the return PROPAGATE functionality.
Diffstat (limited to 'src/displayapp')
| -rw-r--r-- | src/displayapp/Apps.h.in (renamed from src/displayapp/Apps.h) | 2 | ||||
| -rw-r--r-- | src/displayapp/UserApps.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/displayapp/Apps.h b/src/displayapp/Apps.h.in index ebd8bf78..23ad12a3 100644 --- a/src/displayapp/Apps.h +++ b/src/displayapp/Apps.h.in @@ -63,6 +63,8 @@ namespace Pinetime { static constexpr size_t Count = sizeof...(As); }; + using UserAppTypes = TypeList<@USERAPP_TYPES@>; + template <WatchFace... Ws> struct WatchFaceTypeList { static constexpr size_t Count = sizeof...(Ws); diff --git a/src/displayapp/UserApps.h b/src/displayapp/UserApps.h index cb6d5779..985b335f 100644 --- a/src/displayapp/UserApps.h +++ b/src/displayapp/UserApps.h @@ -1,5 +1,5 @@ #pragma once -#include "Apps.h" +#include "displayapp/Apps.h" #include "Controllers.h" #include "displayapp/screens/Alarm.h" |