diff --git a/CMakeLists.txt b/CMakeLists.txt index cf8b5706a..31b9bf3b7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,8 +25,8 @@ set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_LIST_DIR}/firmware/toolchain-arm-cortex project(portapack-h1) -#set(VERSION "") -if (NOT DEFINED VERSION) +set(VERSION "$ENV{VERSION_STRING}") +if ("$ENV{EnvironmentVariableName}" STREQUAL "") execute_process( COMMAND git log -n 1 --format=%h WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} diff --git a/firmware/application/ui_navigation.hpp b/firmware/application/ui_navigation.hpp index 9cc5fa876..316911347 100644 --- a/firmware/application/ui_navigation.hpp +++ b/firmware/application/ui_navigation.hpp @@ -212,7 +212,7 @@ namespace ui void refresh(); private: - static constexpr auto version_string = "v1.4.4"; + // static constexpr auto version_string = "v1.4.4"; NavigationView &nav_; Rectangle backdrop{ @@ -221,7 +221,7 @@ namespace ui Text version{ {2, 0, 11 * 8, 16}, - version_string}; + VERSION_STRING}; LiveDateTime ltime{ {86, 0, 19 * 8, 16}};