pyrox.dev
1diff --git a/CMakeLists.txt b/CMakeLists.txt
2index d362165d..7e3dfd09 100644
3--- a/CMakeLists.txt
4+++ b/CMakeLists.txt
5@@ -23,45 +23,6 @@ if(DEFINED ENV{VULKAN_SDK})
6 endif()
7 endif()
8
9-# Git is used for git-describe based version generation if we have it
10-find_package(Git)
11-
12-#Set up versioning (with a dummy string for now if Git isn't present)
13-if(Git_FOUND)
14- execute_process(
15- COMMAND ${GIT_EXECUTABLE} describe --always --tags
16- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
17- OUTPUT_VARIABLE NGSCOPECLIENT_VERSION
18- OUTPUT_STRIP_TRAILING_WHITESPACE)
19- message("Git reports scopehal-apps version ${NGSCOPECLIENT_VERSION}")
20-
21-
22- execute_process(
23- COMMAND ${GIT_EXECUTABLE} describe --always --tags --long
24- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
25- OUTPUT_VARIABLE NGSCOPECLIENT_VERSION_LONG
26- OUTPUT_STRIP_TRAILING_WHITESPACE)
27-
28- # TODO: if/when we have a point release, make MSI version 10x+9
29- # ex: 0.1.2-rc2 is 0.1.22
30- # ex: 0.1.2 is 0.1.29
31-
32- # Ugly string parsing to make windows build happy
33- # First path: release candidate tags
34- if(NGSCOPECLIENT_VERSION_LONG MATCHES "v([0-9]*).([0-9]*)-rc([0-9])-([0-9]*)")
35- set(MSI_VERSION "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}.${CMAKE_MATCH_4}")
36-
37- # Release tags
38- elseif(NGSCOPECLIENT_VERSION_LONG MATCHES "v([0-9]*).([0-9]*)-([0-9]*)")
39- set(MSI_VERSION "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.9.${CMAKE_MATCH_3}")
40- endif()
41-
42-else()
43- set(NGSCOPECLIENT_VERSION "unknown")
44- set(MSI_VERSION "0.1")
45- message("Git not detected, scopehal-apps version unknown")
46-endif()
47-
48 set(PROJECT_VERSION "${NGSCOPECLIENT_VERSION}")
49
50 include(CTest)