Updated to include WatchFaceAnalog and fixed clashes
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
cmake_minimum_required(VERSION 3.10)
|
||||
project(pinetime VERSION 0.14.0 LANGUAGES C CXX ASM)
|
||||
project(pinetime VERSION 0.15.0 LANGUAGES C CXX ASM)
|
||||
|
||||
set(CMAKE_C_STANDARD 99)
|
||||
set(CMAKE_CXX_STANDARD 14)
|
||||
@@ -51,6 +51,10 @@ if(DEFINED USE_DEBUG_PINS AND USE_DEBUG_PINS)
|
||||
add_definitions(-DUSE_DEBUG_PINS)
|
||||
endif()
|
||||
|
||||
if(BUILD_DFU)
|
||||
set(BUILD_DFU true)
|
||||
endif()
|
||||
|
||||
message("BUILD CONFIGURATION")
|
||||
message("-------------------")
|
||||
message(" * Version : " ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
|
||||
@@ -72,6 +76,11 @@ if(USE_DEBUG_PINS)
|
||||
else()
|
||||
message(" * Debug pins : Disabled")
|
||||
endif()
|
||||
if(BUILD_DFU)
|
||||
message(" * Build DFU (using adafruit-nrfutil) : Enabled")
|
||||
else()
|
||||
message(" * Build DFU (using adafruit-nrfutil) : Disabled")
|
||||
endif()
|
||||
|
||||
set(VERSION_EDIT_WARNING "// Do not edit this file, it is automatically generated by CMAKE!")
|
||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/Version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/src/Version.h)
|
||||
|
Reference in New Issue
Block a user