diff options
| author | JF <jf@codingfield.com> | 2021-03-07 20:29:59 (GMT) |
|---|---|---|
| committer | Gitea <gitea@fake.local> | 2021-03-07 20:29:59 (GMT) |
| commit | 5cd4b36d6bbf22095e0ff54aa3773febc6e1f22e (patch) | |
| tree | eac51e42451d827c30fd6572b377c5bbf03f0e24 /CMakeLists.txt | |
| parent | b89c92b71d82b4e3bf612519a5cf9b2f12886168 (diff) | |
| parent | e63596b291f973cdeb01cd0ac276861895bd4489 (diff) | |
Merge branch 'develop' of JF/PineTime into master
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ac7c890..54ef9fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.10) -project(pinetime VERSION 0.14.0 LANGUAGES C CXX ASM) +project(pinetime VERSION 0.14.1 LANGUAGES C CXX ASM) set(NRF_TARGET "nrf52") @@ -41,6 +41,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}) @@ -62,6 +66,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) |