mirror of
https://github.com/binary-kitchen/doorlockd
synced 2024-11-16 03:59:11 +01:00
Simplified version string
This commit is contained in:
parent
32ebec327d
commit
4d2bdba703
@ -7,7 +7,7 @@ set(DOORLOCKD_VERSION_MAJOR 1)
|
|||||||
set(DOORLOCKD_VERSION_MINOR 0)
|
set(DOORLOCKD_VERSION_MINOR 0)
|
||||||
set(DOORLOCKD_VERSION_PATCH 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}")
|
MESSAGE(STATUS "doorlockd version: ${DOORLOCKD_VERSION}")
|
||||||
|
|
||||||
|
@ -6,6 +6,7 @@
|
|||||||
#define DOORLOCKD_VERSION_MAJOR "@DOORLOCKD_VERSION_MAJOR@"
|
#define DOORLOCKD_VERSION_MAJOR "@DOORLOCKD_VERSION_MAJOR@"
|
||||||
#define DOORLOCKD_VERSION_MINOR "@DOORLOCKD_VERSION_MINOR@"
|
#define DOORLOCKD_VERSION_MINOR "@DOORLOCKD_VERSION_MINOR@"
|
||||||
#define DOORLOCKD_VERSION_PATCH "@DOORLOCKD_VERSION_PATCH@"
|
#define DOORLOCKD_VERSION_PATCH "@DOORLOCKD_VERSION_PATCH@"
|
||||||
|
#define DOORLOCKD_VERSION "@DOORLOCKD_VERSION@"
|
||||||
|
|
||||||
#define DOORLOCKD_GIT_BRANCH @GIT_BRANCH@
|
#define DOORLOCKD_GIT_BRANCH @GIT_BRANCH@
|
||||||
#define DOORLOCKD_GIT_COMMIT_HASH @GIT_COMMIT_HASH@
|
#define DOORLOCKD_GIT_COMMIT_HASH @GIT_COMMIT_HASH@
|
||||||
|
@ -20,8 +20,7 @@ using boost::asio::ip::tcp;
|
|||||||
|
|
||||||
// Info about doorlockd version
|
// Info about doorlockd version
|
||||||
const static std::string version =
|
const static std::string version =
|
||||||
(std::string)"doorlockd-" + DOORLOCKD_VERSION_MAJOR + "."
|
"doorlockd-" DOORLOCKD_VERSION;
|
||||||
+ DOORLOCKD_VERSION_MINOR + "-" + DOORLOCKD_VERSION_PATCH;
|
|
||||||
const static std::string gitversion =
|
const static std::string gitversion =
|
||||||
DOORLOCKD_GIT_BRANCH "-" DOORLOCKD_GIT_COMMIT_HASH;
|
DOORLOCKD_GIT_BRANCH "-" DOORLOCKD_GIT_COMMIT_HASH;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user