allow version info from variable

jmlich · Mar 5, 2021 · 4d65393 · 4d65393
1 parent dad46f8
commit 4d65393
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -28,7 +28,9 @@ execute_process(COMMAND
   ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
-add_definitions( -DGIT_VERSION="${GIT_VERSION}" )
+set(VERSION "${GIT_VERSION}" CACHE STRING "Manaly defined version string")
+
+add_definitions( -DGIT_VERSION="${VERSION}" )
 
 find_package(Qt5 COMPONENTS Core Gui Network Widgets WebEngineWidgets WebChannel LinguistTools REQUIRED)
 

diff --git a/com.github.jmlich.geotagging.json b/com.github.jmlich.geotagging.json
@@ -31,7 +31,8 @@
       "name": "geotagging",
       "buildsystem": "cmake-ninja",
       "config-opts": [
-        "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
+        "-DCMAKE_BUILD_TYPE=RelWithDebInfo",
+        "-DVERSION:STRING=0.5.7"
       ],
       "sources": [
         {

diff --git a/com.github.jmlich.geotagging.spec b/com.github.jmlich.geotagging.spec
@@ -23,7 +23,7 @@ Photography geotagging tool
 %setup -q -n %{name}-%{version}
 
 %build
-%cmake
+%cmake -DVERSION:STRING=%{version}
 %cmake_build
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,7 +23,7 @@ Photography geotagging tool @@
     %setup -q -n %{name}-%{version}
     %build
-    %cmake
+    %cmake -DVERSION:STRING=%{version}
     %cmake_build
@@ Expand Down @@