tom/doorlockd-mirror
1
0
Fork 0
mirror of https://github.com/binary-kitchen/doorlockd synced 2024-12-22 10:24:26 +01:00
Code Issues Releases Wiki Activity

Simplified version string

Browse Source
This commit is contained in:
Ralf Ramsauer 2015-09-23 15:50:26 +02:00
parent 32ebec327d
commit 4d2bdba703
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doorlockd/CMakeLists.txt
View File

@ -7,7 +7,7 @@ set(DOORLOCKD_VERSION_MAJOR 1)
set(DOORLOCKD_VERSION_MINOR 0)
set(DOORLOCKD_VERSION_PATCH 0)
set(DOORLOCKD_VERSION "${DOORLOCKD_VERSION_MAJOR}.${DOORLOCKD_VERSION_MINOR}.${DOORLOCKD_VERSION_PATCH}")
set(DOORLOCKD_VERSION "${DOORLOCKD_VERSION_MAJOR}.${DOORLOCKD_VERSION_MINOR}-${DOORLOCKD_VERSION_PATCH}")
MESSAGE(STATUS "doorlockd version: ${DOORLOCKD_VERSION}")

1
doorlockd/config.h.in
View File

@ -6,6 +6,7 @@
#define DOORLOCKD_VERSION_MAJOR "@DOORLOCKD_VERSION_MAJOR@"
#define DOORLOCKD_VERSION_MINOR "@DOORLOCKD_VERSION_MINOR@"
#define DOORLOCKD_VERSION_PATCH "@DOORLOCKD_VERSION_PATCH@"
#define DOORLOCKD_VERSION "@DOORLOCKD_VERSION@"
#define DOORLOCKD_GIT_BRANCH @GIT_BRANCH@
#define DOORLOCKD_GIT_COMMIT_HASH @GIT_COMMIT_HASH@

3
doorlockd/main.cpp
View File

@ -20,8 +20,7 @@ using boost::asio::ip::tcp;
// Info about doorlockd version
const static std::string version =
(std::string)"doorlockd-" + DOORLOCKD_VERSION_MAJOR + "."
+ DOORLOCKD_VERSION_MINOR + "-" + DOORLOCKD_VERSION_PATCH;
"doorlockd-" DOORLOCKD_VERSION;
const static std::string gitversion =
DOORLOCKD_GIT_BRANCH "-" DOORLOCKD_GIT_COMMIT_HASH;