From 923d24b44874c0246e9a1f6901b60a79008b5b73 Mon Sep 17 00:00:00 2001 From: thez3ro Date: Thu, 1 Mar 2018 14:39:22 +0100 Subject: [PATCH] release build when checking out a git-tag --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7410b4e04..8684cc519 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,7 +80,9 @@ set_property(CACHE KEEPASSXC_BUILD_TYPE PROPERTY STRINGS Snapshot Release PreRel execute_process(COMMAND git tag --points-at HEAD WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE GIT_TAG) -if(NOT GIT_TAG AND EXISTS ${CMAKE_SOURCE_DIR}/.version) +if(GIT_TAG) + set(OVERRIDE_VERSION ${GIT_TAG}) +elseif(EXISTS ${CMAKE_SOURCE_DIR}/.version) file(READ ${CMAKE_SOURCE_DIR}/.version OVERRIDE_VERSION) endif()