GRPC: Move to version strings rather than int to avoid octal numbers

OPM · Aug 26, 2019 · 7b9e667 · 7b9e667
1 parent a5b2a2e
commit 7b9e667
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/ApplicationCode/Adm/RiaVersionInfo.h.cmake b/ApplicationCode/Adm/RiaVersionInfo.h.cmake
@@ -27,8 +27,8 @@
 #define PRODUCTVER     "@PRODUCTVER@"
 #define STRPRODUCTVER  "@STRPRODUCTVER@"
 
-#define RESINSIGHT_MAJOR_VERSION @RESINSIGHT_MAJOR_VERSION@
-#define RESINSIGHT_MINOR_VERSION @RESINSIGHT_MINOR_VERSION@
-#define RESINSIGHT_PATCH_VERSION @RESINSIGHT_PATCH_VERSION@
+#define RESINSIGHT_MAJOR_VERSION "@RESINSIGHT_MAJOR_VERSION@"
+#define RESINSIGHT_MINOR_VERSION "@RESINSIGHT_MINOR_VERSION@"
+#define RESINSIGHT_PATCH_VERSION "@RESINSIGHT_PATCH_VERSION@"
 
 #define RESINSIGHT_OCTAVE_VERSION "@OCTAVE_VERSION_STRING@"
diff --git a/ApplicationCode/GrpcInterface/RiaGrpcAppService.cpp b/ApplicationCode/GrpcInterface/RiaGrpcAppService.cpp
@@ -27,9 +27,9 @@
 //--------------------------------------------------------------------------------------------------
 grpc::Status RiaGrpcAppService::GetVersion(grpc::ServerContext* context, const rips::Empty* request, rips::Version* reply)
 {
-    reply->set_major_version(RESINSIGHT_MAJOR_VERSION);
-    reply->set_minor_version(RESINSIGHT_MINOR_VERSION);
-    reply->set_patch_version(RESINSIGHT_PATCH_VERSION);
+    reply->set_major_version(QString(RESINSIGHT_MAJOR_VERSION).toInt());
+    reply->set_minor_version(QString(RESINSIGHT_MINOR_VERSION).toInt());
+    reply->set_patch_version(QString(RESINSIGHT_PATCH_VERSION).toInt());
     return grpc::Status::OK;
 }
 

diff --git a/ResInsightVersion.cmake b/ResInsightVersion.cmake
@@ -1,6 +1,6 @@
 
 set(RESINSIGHT_MAJOR_VERSION 2019)
-set(RESINSIGHT_MINOR_VERSION 8)
+set(RESINSIGHT_MINOR_VERSION 08)
 set(RESINSIGHT_PATCH_VERSION 0)
 
 # Opional text with no restrictions