tjh.dev
1diff --git a/CMakeLists.txt b/CMakeLists.txt
2index 349af6acf7..7ffec0b4cb 100644
3--- a/CMakeLists.txt
4+++ b/CMakeLists.txt
5@@ -196,52 +196,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")
6 set(SUN TRUE)
7 endif()
8
9-find_package(Git)
10-if(Git_FOUND)
11- if (NOT DEFINED GIT_COMMIT_HASH)
12- execute_process(
13- COMMAND ${GIT_EXECUTABLE} log -1 --format=%h
14- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
15- RESULT_VARIABLE GIT_RESULT
16- OUTPUT_VARIABLE GIT_COMMIT_HASH
17- OUTPUT_STRIP_TRAILING_WHITESPACE)
18- endif()
19- execute_process(
20- COMMAND ${GIT_EXECUTABLE} describe --tags --abbrev=0
21- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
22- OUTPUT_VARIABLE GIT_LAST_TAG
23- OUTPUT_STRIP_TRAILING_WHITESPACE)
24- execute_process(
25- COMMAND ${GIT_EXECUTABLE} describe --tags --long
26- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
27- OUTPUT_VARIABLE GIT_ITERATION
28- OUTPUT_STRIP_TRAILING_WHITESPACE)
29-else()
30- message("Git NOT FOUND")
31-endif()
32-
33-if(GIT_RESULT EQUAL "0")
34- string(REGEX REPLACE "v([0-9]+).[0-9]+.[0-9]+" "\\1" DUCKDB_MAJOR_VERSION "${GIT_LAST_TAG}")
35- string(REGEX REPLACE "v[0-9]+.([0-9]+).[0-9]+" "\\1" DUCKDB_MINOR_VERSION "${GIT_LAST_TAG}")
36- string(REGEX REPLACE "v[0-9]+.[0-9]+.([0-9]+)" "\\1" DUCKDB_PATCH_VERSION "${GIT_LAST_TAG}")
37- string(REGEX REPLACE ".*-([0-9]+)-.*" "\\1" DUCKDB_DEV_ITERATION "${GIT_ITERATION}")
38-
39- if(DUCKDB_DEV_ITERATION EQUAL 0)
40- # on a tag; directly use the version
41- set(DUCKDB_VERSION "${GIT_LAST_TAG}")
42- else()
43- # not on a tag, increment the patch version by one and add a -devX suffix
44- math(EXPR DUCKDB_PATCH_VERSION "${DUCKDB_PATCH_VERSION}+1")
45- set(DUCKDB_VERSION "v${DUCKDB_MAJOR_VERSION}.${DUCKDB_MINOR_VERSION}.${DUCKDB_PATCH_VERSION}-dev${DUCKDB_DEV_ITERATION}")
46- endif()
47-else()
48- # fallback for when building from tarball
49- set(DUCKDB_MAJOR_VERSION 0)
50- set(DUCKDB_MINOR_VERSION 0)
51- set(DUCKDB_PATCH_VERSION 1)
52- set(DUCKDB_DEV_ITERATION 0)
53- set(DUCKDB_VERSION "v${DUCKDB_MAJOR_VERSION}.${DUCKDB_MINOR_VERSION}.${DUCKDB_PATCH_VERSION}-dev${DUCKDB_DEV_ITERATION}")
54-endif()
55+set(DUCKDB_VERSION "@DUCKDB_VERSION@")
56
57 message(STATUS "git hash ${GIT_COMMIT_HASH}, version ${DUCKDB_VERSION}")
58