From 659c4fad56da8d285060c8d0edd3918e8c5a1575 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20M=C3=BCller?= Date: Sat, 11 Jan 2020 11:04:07 +0100 Subject: Change version to git describe and make set-able from outside Change version to use git describe instead of git log as this will also work if tags are present and make the version string set-able from outside as a parameter to cmake, so that package managers can set this if building outside of a git working tree. --- common/command.cc | 4 ++-- common/version.h.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'common') diff --git a/common/command.cc b/common/command.cc index c2f02b27..3866caca 100644 --- a/common/command.cc +++ b/common/command.cc @@ -69,14 +69,14 @@ bool CommandHandler::executeBeforeContext() { if (vm.count("help") || argc == 1) { std::cerr << boost::filesystem::basename(argv[0]) - << " -- Next Generation Place and Route (git sha1 " GIT_COMMIT_HASH_STR ")\n"; + << " -- Next Generation Place and Route (Version " GIT_DESCRIBE_STR ")\n"; std::cerr << options << "\n"; return argc != 1; } if (vm.count("version")) { std::cerr << boost::filesystem::basename(argv[0]) - << " -- Next Generation Place and Route (git sha1 " GIT_COMMIT_HASH_STR ")\n"; + << " -- Next Generation Place and Route (Version " GIT_DESCRIBE_STR ")\n"; return true; } validate(); diff --git a/common/version.h.in b/common/version.h.in index 8072116b..c67d7d52 100644 --- a/common/version.h.in +++ b/common/version.h.in @@ -1,6 +1,6 @@ #ifndef VERSION_H #define VERSION_H -#define GIT_COMMIT_HASH_STR "@GIT_COMMIT_HASH@" +#define GIT_DESCRIBE_STR "@CURRENT_GIT_VERSION@" #endif \ No newline at end of file -- cgit v1.2.3