1
0
Fork 0

Fix constness and set version to 0.8.1.

This commit is contained in:
JF 2020-09-02 21:36:13 +02:00
parent 1aa5b0a440
commit 4e8e52bf6e
2 changed files with 3 additions and 3 deletions

View file

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.10)
project(pinetime VERSION 0.8.0 LANGUAGES C CXX ASM) project(pinetime VERSION 0.8.1 LANGUAGES C CXX ASM)
set(NRF_TARGET "nrf52") set(NRF_TARGET "nrf52")

View file

@ -8,11 +8,11 @@ namespace Pinetime {
static constexpr uint32_t Major() {return major;} static constexpr uint32_t Major() {return major;}
static constexpr uint32_t Minor() {return minor;} static constexpr uint32_t Minor() {return minor;}
static constexpr uint32_t Patch() {return patch;} static constexpr uint32_t Patch() {return patch;}
static constexpr char* VersionString() {return versionString;} static constexpr const char* VersionString() {return versionString;}
private: private:
static constexpr uint32_t major = @PROJECT_VERSION_MAJOR@; static constexpr uint32_t major = @PROJECT_VERSION_MAJOR@;
static constexpr uint32_t minor = @PROJECT_VERSION_MINOR@; static constexpr uint32_t minor = @PROJECT_VERSION_MINOR@;
static constexpr uint32_t patch = @PROJECT_VERSION_PATCH@; static constexpr uint32_t patch = @PROJECT_VERSION_PATCH@;
static constexpr char* versionString = "@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@"; static constexpr const char* versionString = "@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@";
}; };
} }