From 242f1e7e29e1ce73358d1389787f8a2f62efa512 Mon Sep 17 00:00:00 2001 From: Andrew Nelless Date: Thu, 27 Apr 2017 15:59:22 +0100 Subject: [PATCH] Rename VERSION to SYNERGY_VERSION --- CMakeLists.txt | 2 +- res/config.h.in | 2 +- src/lib/common/Version.cpp | 8 ++++---- src/lib/common/Version.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6eeaff08..277c9490 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -309,7 +309,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows") /DWIN32 /D_WINDOWS /D_CRT_SECURE_NO_WARNINGS - /DVERSION=\"${VERSION}\" + /DSYNERGY_VERSION=\"${SYNERGY_VERSION}\" /D_XKEYCHECK_H ) endif() diff --git a/res/config.h.in b/res/config.h.in index e0a57752..9a64c532 100644 --- a/res/config.h.in +++ b/res/config.h.in @@ -1,5 +1,5 @@ /* Define version here for Unix, but using /D for Windows. */ -#cmakedefine VERSION "${VERSION}" +#cmakedefine SYNERGY_VERSION "${SYNERGY_VERSION}" /* Define to the base type of arg 3 for `accept`. */ #cmakedefine ACCEPT_TYPE_ARG3 ${ACCEPT_TYPE_ARG3} diff --git a/src/lib/common/Version.cpp b/src/lib/common/Version.cpp index 2781e7e4..d6449067 100644 --- a/src/lib/common/Version.cpp +++ b/src/lib/common/Version.cpp @@ -22,7 +22,7 @@ const char* kApplication = "Synergy"; const char* kCopyright = "Copyright (C) 2012-2016 Symless Ltd.\n" "Copyright (C) 2008-2014 Nick Bolton\n" "Copyright (C) 2002-2014 Chris Schoeneman"; -const char* kContact = "Email: nick@symless.com"; -const char* kWebsite = "http://symless.com/"; -const char* kVersion = VERSION; -const char* kAppVersion = "Synergy " VERSION; +const char* kContact = "Email: engineering@symless.com"; +const char* kWebsite = "https://symless.com/"; +const char* kVersion = SYNERGY_VERSION; +const char* kAppVersion = "Synergy " SYNERGY_VERSION; diff --git a/src/lib/common/Version.h b/src/lib/common/Version.h index 80eaa1e7..9ba0a66e 100644 --- a/src/lib/common/Version.h +++ b/src/lib/common/Version.h @@ -21,7 +21,7 @@ #include "common/common.h" // set version macro if not set yet -#if !defined(VERSION) +#if !defined(SYNERGY_VERSION) #error Version was not set (should be passed to compiler). #endif