Merge pull request #263 from louisrubet/develop

v2.4.2

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.4.2] - 2022-03-03
+
+### Fixed
+
+- Version string were not correctly shown using flatpak generation
+
 ## [2.4.1] - 2022-03-02
 
 ### Added

CMakeLists.txt

@@ -11,14 +11,16 @@ endif()
 
 message(STATUS "Build mode: ${CMAKE_BUILD_TYPE}")
 
-if(EXISTS "${PROJECT_SOURCE_DIR}/.git")
-    execute_process(COMMAND git describe HEAD OUTPUT_VARIABLE "GIT_VERSION" OUTPUT_STRIP_TRAILING_WHITESPACE)
-    add_definitions(-DGIT_VERSION="${GIT_VERSION}")
-else(EXISTS ${PROJECT_SOURCE_DIR}/.git)
-    set(GIT_VERSION "unknown")
+if(NOT DEFINED RPN_VERSION)
+    if(EXISTS "${PROJECT_SOURCE_DIR}/.git")
+        execute_process(COMMAND git describe HEAD OUTPUT_VARIABLE "RPN_VERSION" OUTPUT_STRIP_TRAILING_WHITESPACE)
+    else(EXISTS ${PROJECT_SOURCE_DIR}/.git)
+        set(VERSION "unknown")
+    endif()
+    add_definitions(-DGIT_VERSION="${RPN_VERSION}")
 endif()
-add_definitions(-DGIT_VERSION="${GIT_VERSION}")
-message("GIT_VERSION is ${GIT_VERSION}")
+message("RPN_VERSION is ${RPN_VERSION}")
+add_definitions(-DRPN_VERSION="${RPN_VERSION}")
 
 # INFO
 set(RPN_DISPLAY_NAME "rpn")

src/version.h

@@ -3,6 +3,8 @@
 #ifndef SRC_VERSION_H_
 #define SRC_VERSION_H_
 
-#define RPN_VERSION GIT_VERSION  // set by cmake from git tag
+#ifndef RPN_VERSION
+#define RPN_VERSION "dev version"  // set by cmake from git tag
+#endif
 
 #endif  // SRC_VERSION_H_