aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzczepan Zalega <szczepan@nitrokey.com>2018-06-19 20:34:31 +0200
committerSzczepan Zalega <szczepan@nitrokey.com>2018-06-19 20:34:31 +0200
commitf00638bb860183f900d7c396d2f7f444821e1db3 (patch)
tree752bccb49786604ced70e04647cd2303f0b6abcf
parente1ef8d79809190c5ac5d540bd4aa376dcfda7e93 (diff)
downloadlibnitrokey-119-qmake_version_getter.tar.gz
libnitrokey-119-qmake_version_getter.tar.bz2
DEBUG Initial idea for #119. Better would be having default values in version.cc in repository and overwriting it with CMake via configure file.119-qmake_version_getter
Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
-rw-r--r--libnitrokey.pro1
-rw-r--r--version.cc.in12
2 files changed, 13 insertions, 0 deletions
diff --git a/libnitrokey.pro b/libnitrokey.pro
index ea86294..6db0468 100644
--- a/libnitrokey.pro
+++ b/libnitrokey.pro
@@ -40,6 +40,7 @@ SOURCES = \
$$PWD/DeviceCommunicationExceptions.cpp \
$$PWD/log.cc \
$$PWD/misc.cc \
+ $$PWD/version.cc \
$$PWD/NitrokeyManager.cc \
$$PWD/NK_C_API.cc
diff --git a/version.cc.in b/version.cc.in
index 0eae647..07ae8e7 100644
--- a/version.cc.in
+++ b/version.cc.in
@@ -23,15 +23,27 @@
namespace nitrokey {
unsigned int get_major_library_version() {
+ #ifndef PROJECT_VERSION_MAJOR
return @PROJECT_VERSION_MAJOR@;
+ #else
+ return PROJECT_VERSION_MAJOR;
+ #endif
}
unsigned int get_minor_library_version() {
+ #ifndef PROJECT_VERSION_MINOR
return @PROJECT_VERSION_MINOR@;
+ #else
+ return PROJECT_VERSION_MINOR;
+ #endif
}
const char* get_library_version() {
+ #ifndef PROJECT_VERSION_GIT
return "@PROJECT_VERSION_GIT@";
+ #else
+ return PROJECT_VERSION_GIT;
+ #endif
}
}