apps: restore default apps ordering in CMake
Restore the default list of apps to compile. The ordering was changed in the changeset to make the app-list configurable through a CMake-variable in https://github.com/InfiniTimeOrg/InfiniTime/pull/1928 In the process have one app per line to create the default app list in CMake. This makes git diffs easer and more readable.
This commit is contained in:
		
							parent
							
								
									f34aede897
								
							
						
					
					
						commit
						12acef6a71
					
				| @ -1,7 +1,20 @@ | ||||
| if(DEFINED ENABLE_USERAPPS) | ||||
|     set(USERAPP_TYPES ${ENABLE_USERAPPS} CACHE STRING "List of user apps to build into the firmware") | ||||
| else () | ||||
|     set(USERAPP_TYPES "Apps::Navigation, Apps::StopWatch, Apps::Alarm, Apps::Timer, Apps::Steps, Apps::HeartRate, Apps::Music, Apps::Paint, Apps::Paddle, Apps::Twos, Apps::Metronome" CACHE STRING "List of user apps to build into the firmware") | ||||
|     set(DEFAULT_USER_APP_TYPES "Apps::StopWatch") | ||||
|     set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Alarm") | ||||
|     set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Timer") | ||||
|     set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Steps") | ||||
|     set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::HeartRate") | ||||
|     set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Music") | ||||
|     set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Paint") | ||||
|     set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Paddle") | ||||
|     set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Twos") | ||||
|     set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Metronome") | ||||
|     set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Navigation") | ||||
|     #set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Weather") | ||||
|     #set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Motion") | ||||
|     set(USERAPP_TYPES "${DEFAULT_USER_APP_TYPES}" CACHE STRING "List of user apps to build into the firmware") | ||||
| endif () | ||||
| 
 | ||||
| add_library(infinitime_apps INTERFACE) | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Reinhold Gschweicher
						Reinhold Gschweicher