Add version info, WiP #72

ReproNim · Jan 31, 2024 · 81f9141 · 81f9141
1 parent 4ddb10c
commit 81f9141
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
@@ -31,9 +31,13 @@ jobs:
       working-directory: Capture
 
     - name: Test "reprostim-videocapture -h"
-      run: ./reprostim-videocapture -h
+      run: |
+        ./reprostim-videocapture -V
+        ./reprostim-videocapture -h
       working-directory: Capture/build/videocapture
 
     - name: Test "reprostim-screencapture -h"
-      run: ./reprostim-screencapture -h
+      run: |
+        ./reprostim-screencapture -V
+        ./reprostim-screencapture -h
       working-directory: Capture/build/screencapture
diff --git a/Capture/CMakeLists.txt b/Capture/CMakeLists.txt
@@ -12,6 +12,11 @@ set(CAPTURE_VERSION_PATCH 0)
 set(CAPTURE_VERSION_BUILD 1)
 set(CAPTURE_VERSION_STRING "${CAPTURE_VERSION_MAJOR}.${CAPTURE_VERSION_MINOR}.${CAPTURE_VERSION_PATCH}.${CAPTURE_VERSION_BUILD}")
 string(TIMESTAMP CAPTURE_VERSION_DATE "%Y-%m-%d %H:%M:%S")
+execute_process(
+        COMMAND git describe --tags --always
+        OUTPUT_VARIABLE CAPTURE_VERSION_TAG
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+)
 
 # ARCH:=$(shell uname -m)
 set(ARCH x64)

diff --git a/Capture/capturelib/include/CaptureVer.h.in b/Capture/capturelib/include/CaptureVer.h.in
@@ -8,5 +8,6 @@
 #define CAPTURE_VERSION_BUILD ${CAPTURE_VERSION_BUILD}
 #define CAPTURE_VERSION_STRING "${CAPTURE_VERSION_STRING}"
 #define CAPTURE_VERSION_DATE "${CAPTURE_VERSION_DATE}"
+#define CAPTURE_VERSION_TAG "${CAPTURE_VERSION_TAG}"
 
 #endif //CAPTURE_CAPTUREVER_H
diff --git a/Capture/capturelib/src/CaptureApp.cpp b/Capture/capturelib/src/CaptureApp.cpp
@@ -95,7 +95,8 @@ namespace reprostim {
 
 	void CaptureApp::printVersion() {
 		_INFO(appName << " " << CAPTURE_VERSION_STRING);
-		_INFO(" Build date " << CAPTURE_VERSION_DATE);
+		_INFO(" Build Date : " << CAPTURE_VERSION_DATE);
+		_INFO(" Build Tag  : " << CAPTURE_VERSION_TAG);
 	}
 
 	int CaptureApp::run(int argc, char* argv[]) {