improve definition of MIRALL_VERSION_SUFFIX and MIRALL_VERSION_BUILD

should allow ompiling with MIRALL_VERSION_SUFFIX be empty

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>

diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp
index 51a42f4ce92bfc4886d6af0d81681a44dbf4c3c6..7e717bf05f1be10ca479abaed722ae5396ba6149 100644 (file)
--- a/src/libsync/theme.cpp
+++ b/src/libsync/theme.cpp
@@ -214,7 +214,7 @@ QString Theme::version() const
 
 QString Theme::versionSuffix() const
 {
-    return QString::fromLatin1(MIRALL_STRINGIFY(MIRALL_VERSION_SUFFIX));
+    return QString::fromLatin1(MIRALL_VERSION_SUFFIX);
 }
 
 QString Theme::configFileName() const

diff --git a/version.h.in b/version.h.in
index b8d97bb785746269688531c73f963b5252ad4943..ba53a6545f7a16687dfb582fe76b0e5c6fc456d8 100644 (file)
--- a/version.h.in
+++ b/version.h.in
@@ -25,17 +25,16 @@
 #define MIRALL_TOSTRING(s) #s
 
 /* MIRALL version */
-#define MIRALL_VERSION_MAJOR @MIRALL_VERSION_MAJOR@
-#define MIRALL_VERSION_MINOR @MIRALL_VERSION_MINOR@
-#define MIRALL_VERSION_PATCH @MIRALL_VERSION_PATCH@
-#define MIRALL_VERSION_BUILD @MIRALL_VERSION_BUILD@
+constexpr int MIRALL_VERSION_MAJOR = @MIRALL_VERSION_MAJOR@;
+constexpr int MIRALL_VERSION_MINOR = @MIRALL_VERSION_MINOR@;
+constexpr int MIRALL_VERSION_PATCH = @MIRALL_VERSION_PATCH@;
+constexpr int MIRALL_VERSION_BUILD = @MIRALL_VERSION_BUILD@;
+constexpr auto MIRALL_VERSION_SUFFIX = "@MIRALL_VERSION_SUFFIX@";
 
-#define MIRALL_VERSION_SUFFIX @MIRALL_VERSION_SUFFIX@
+#cmakedefine MIRALL_VERSION       @MIRALL_VERSION@
+#cmakedefine MIRALL_VERSION_FULL  @MIRALL_VERSION_FULL@
 
-#define MIRALL_VERSION       @MIRALL_VERSION@
-#define MIRALL_VERSION_FULL  @MIRALL_VERSION_FULL@
-
-#define MIRALL_VERSION_STRING "@MIRALL_VERSION_STRING@"
+#cmakedefine MIRALL_VERSION_STRING "@MIRALL_VERSION_STRING@"
 
 constexpr int NEXTCLOUD_SERVER_VERSION_MIN_SUPPORTED_MAJOR = @NEXTCLOUD_SERVER_VERSION_MIN_SUPPORTED_MAJOR@;
 constexpr int NEXTCLOUD_SERVER_VERSION_MIN_SUPPORTED_MINOR = @NEXTCLOUD_SERVER_VERSION_MIN_SUPPORTED_MINOR@;