From 8c9ff2d79a81b799fd2b598f14b587298ea538b0 Mon Sep 17 00:00:00 2001 From: Teon Banek Date: Tue, 26 Sep 2017 09:43:43 +0200 Subject: [PATCH] Add version.hpp.in and display it on '--version' flag Reviewers: mferencevic, buda, mislav.bradac Reviewed By: mislav.bradac Subscribers: pullbot Differential Revision: https://phabricator.memgraph.io/D831 --- CMakeLists.txt | 5 +++++ src/memgraph_bolt.cpp | 3 +++ src/version.hpp.in | 3 +++ 3 files changed, 11 insertions(+) create mode 100644 src/version.hpp.in diff --git a/CMakeLists.txt b/CMakeLists.txt index b26fd719c..5b1268c0d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,6 +81,11 @@ set(libs_dir ${CMAKE_SOURCE_DIR}/libs) set(tests_dir ${CMAKE_SOURCE_DIR}/tests) # ----------------------------------------------------------------------------- +# Generate a version.hpp file +set(VERSION_STRING ${${project_name}_VERSION}) +configure_file(${src_dir}/version.hpp.in include/version.hpp @ONLY) +include_directories(${CMAKE_CURRENT_BINARY_DIR}/include) + # build flags ----------------------------------------------------------------- # release flags set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG") diff --git a/src/memgraph_bolt.cpp b/src/memgraph_bolt.cpp index 9cc113c6a..57bb03559 100644 --- a/src/memgraph_bolt.cpp +++ b/src/memgraph_bolt.cpp @@ -18,6 +18,8 @@ #include "utils/sysinfo/memory.hpp" #include "utils/terminate_handler.hpp" +#include "version.hpp" + namespace fs = std::experimental::filesystem; using endpoint_t = io::network::NetworkEndpoint; using socket_t = io::network::Socket; @@ -92,6 +94,7 @@ void load_config(int &argc, char **&argv) { int main(int argc, char **argv) { fs::current_path(fs::path(argv[0]).parent_path()); + gflags::SetVersionString(version_string); load_config(argc, argv); google::InitGoogleLogging(argv[0]); diff --git a/src/version.hpp.in b/src/version.hpp.in new file mode 100644 index 000000000..a48a534eb --- /dev/null +++ b/src/version.hpp.in @@ -0,0 +1,3 @@ +#pragma once + +static const char *version_string = "@VERSION_STRING@";