From c845af2f0bb14946c23afd0838d1934b0660dd84 Mon Sep 17 00:00:00 2001 From: Colin McEwan Date: Sun, 5 Dec 2021 20:39:53 +0000 Subject: [PATCH] Release updates --- CMakeLists.txt | 3 +-- ChangeLog | 2 +- data/doc | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 69f770210..aebce40f3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,6 @@ PROJECT(hydrogen) SET(VERSION_MAJOR "1") SET(VERSION_MINOR "1") SET(VERSION_PATCH "1") -SET(VERSION_SUFFIX "dev") SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") @@ -31,7 +30,7 @@ ELSE() ENDIF(VERSION_SUFFIX) # Consider any tagged commit as a release build -EXECUTE_PROCESS(COMMAND git describe --exact-match OUTPUT_VARIABLE GIT_TAG) +EXECUTE_PROCESS(COMMAND git describe --exact-match --tags OUTPUT_VARIABLE GIT_TAG) IF(GIT_TAG) SET(IS_DEVEL_BUILD "false") ELSE() diff --git a/ChangeLog b/ChangeLog index fd4200694..4288b707a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -20xx-xx-xx the hydrogen team +2021-12-05 the hydrogen team * Release 1.1.1 * Bugfixes - fix preferences dialog "OK" button behaviour (#1375) diff --git a/data/doc b/data/doc index 786c0924f..d0195235b 160000 --- a/data/doc +++ b/data/doc @@ -1 +1 @@ -Subproject commit 786c0924fc9b82f2b14d23da681c2236b41ff5f9 +Subproject commit d0195235b984d5eba388fc1bc58dd611cbe37a65