From f9b3969f7220e88ab80072d343b3ead93a36b157 Mon Sep 17 00:00:00 2001 From: Andrew Nelless Date: Tue, 7 Feb 2017 22:52:38 +0000 Subject: [PATCH] Fix up Synergy version number --- CMakeLists.txt | 4 ---- src/gui/CMakeLists.txt | 8 +++++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c7f87c35..b3ffc807 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,10 +15,6 @@ # along with this program. If not, see . # Version number for Synergy -set(VERSION_MAJOR 1) -set(VERSION_MINOR 9) -set(VERSION_REV 0) -set(VERSION_STAGE beta) set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REV}") cmake_minimum_required(VERSION 2.6) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index a249b544..f640f19a 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -25,9 +25,11 @@ if (WIN32) endif() qt5_use_modules (synergyx Core Widgets Network) -target_link_libraries (synergyx ${DNSSD_LIB} shared) +target_link_libraries (synergyx shared) +target_compile_definitions (synergyx PRIVATE -DVERSION_STAGE="${VERSION_STAGE}") +target_compile_definitions (synergyx PRIVATE -DVERSION_REVISION="") if (WIN32) - set_target_properties (synergyx PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:LIBCMT") + target_link_libraries (synergyx ${DNSSD_LIB}) + set_target_properties (synergyx PROPERTIES LINK_FLAGS "/NODEFAULTLIB:LIBCMT") endif()