From 38f664fcf6eef57d5ef0cce9a82b8eb9a52339b4 Mon Sep 17 00:00:00 2001
From: Unknown <robots_only_adrido@gmx.com>
Date: Fri, 29 Mar 2019 13:50:37 +0100
Subject: [PATCH] Print the vendor in version string

---
 Minetestmapper/CMakeLists.txt | 1 +
 Minetestmapper/Mapper.cpp     | 2 +-
 version.h.in                  | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Minetestmapper/CMakeLists.txt b/Minetestmapper/CMakeLists.txt
index 7dce30e..2f6472f 100644
--- a/Minetestmapper/CMakeLists.txt
+++ b/Minetestmapper/CMakeLists.txt
@@ -122,6 +122,7 @@ set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
 set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
 set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
 set(CPACK_PACKAGE_INSTALL_DIRECTORY ${PROJECT_NAME})
+set(CPACK_PACKAGE_VENDOR "Adrido")
 set(CPACK_GENERATOR "ZIP")
 include(CPack)
 install(TARGETS Minetestmapper RUNTIME DESTINATION ${INSTALL_RUNTIME_DIR})
diff --git a/Minetestmapper/Mapper.cpp b/Minetestmapper/Mapper.cpp
index cbcd839..a213161 100644
--- a/Minetestmapper/Mapper.cpp
+++ b/Minetestmapper/Mapper.cpp
@@ -152,7 +152,7 @@ int Mapper::start(int argc, char *argv[]) {
 				return 0;
 				break;
 			case 'V':
-				cout << "Minetestmapper - Version-ID: " << PROJECT_VERSION_MAJOR << "." << PROJECT_VERSION_MINOR << std::endl;
+				cout << "Minetestmapper - Version-ID: " << PROJECT_VERSION << "("<<PACKAGE_VENDOR<<")" << std::endl;
 				return 0;
 				break;
 			case 'i':
diff --git a/version.h.in b/version.h.in
index a988239..7e81ec2 100644
--- a/version.h.in
+++ b/version.h.in
@@ -27,6 +27,7 @@
 #define SPECIALBUILD @SPECIALBUILD@
 #define BUILD_BRANCH "@BUILD_BRANCH@"
 #define PRERELEASE @PRERELEASE@
+#define PACKAGE_VENDOR "@CPACK_PACKAGE_VENDOR@"
 
 /* Copyright string */
 #cmakedefine PROJECT_COPYRIGHT "@PROJECT_COPYRIGHT@"