From 4e8e52bf6e107c295c9bdb46623d4dd869aff8ae Mon Sep 17 00:00:00 2001 From: JF Date: Wed, 2 Sep 2020 21:36:13 +0200 Subject: [PATCH] Fix constness and set version to 0.8.1. --- CMakeLists.txt | 2 +- src/Version.h.in | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f2356f8..ab061611 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ 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") diff --git a/src/Version.h.in b/src/Version.h.in index dce83c82..6ff5938e 100644 --- a/src/Version.h.in +++ b/src/Version.h.in @@ -8,11 +8,11 @@ namespace Pinetime { static constexpr uint32_t Major() {return major;} static constexpr uint32_t Minor() {return minor;} static constexpr uint32_t Patch() {return patch;} - static constexpr char* VersionString() {return versionString;} + static constexpr const char* VersionString() {return versionString;} private: static constexpr uint32_t major = @PROJECT_VERSION_MAJOR@; static constexpr uint32_t minor = @PROJECT_VERSION_MINOR@; 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@"; }; } \ No newline at end of file