Skip to content

Commit 3bb4b50

Browse files
committed
Use git tag version information to produce a 4-octet version number for MSI installers
1 parent cfbf50c commit 3bb4b50

1 file changed

Lines changed: 18 additions & 0 deletions

File tree

CMakeLists.txt

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,26 @@ if(Git_FOUND)
3434
OUTPUT_VARIABLE NGSCOPECLIENT_VERSION
3535
OUTPUT_STRIP_TRAILING_WHITESPACE)
3636
message("Git reports scopehal-apps version ${NGSCOPECLIENT_VERSION}")
37+
38+
execute_process(
39+
COMMAND ${GIT_EXECUTABLE} describe --always --tags --long
40+
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
41+
OUTPUT_VARIABLE NGSCOPECLIENT_VERSION_LONG
42+
OUTPUT_STRIP_TRAILING_WHITESPACE)
43+
44+
# Ugly string parsing to make windows build happy
45+
# First path: release candidate tags
46+
if(NGSCOPECLIENT_VERSION_LONG MATCHES "v([0-9]*).([0-9]*)-rc([0-9])-([0-9]*)")
47+
set(MSI_VERSION "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}.${CMAKE_MATCH_4}")
48+
49+
# Release tags
50+
elseif(NGSCOPECLIENT_VERSION_LONG MATCHES "v([0-9]*).([0-9]*)-([0-9]*)")
51+
set(MSI_VERSION "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.0.${CMAKE_MATCH_3}")
52+
endif()
53+
3754
else()
3855
set(NGSCOPECLIENT_VERSION "unknown")
56+
set(MSI_VERSION "0.1")
3957
message("Git not detected, scopehal-apps version unknown")
4058
endif()
4159

0 commit comments

Comments
 (0)