OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gaute Lindkvist 2019-08-26 15:48:20 +02:00
parent a5b2a2e439
commit 7b9e6677ff
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/Adm/RiaVersionInfo.h.cmake
View File

@ -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@"

6
ApplicationCode/GrpcInterface/RiaGrpcAppService.cpp
View File

@ -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;
}

2
ResInsightVersion.cmake
View File

@ -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