From 637c4f69238620c17ce6d1df27d6b7269ecb8187 Mon Sep 17 00:00:00 2001 From: Iwan Timmer Date: Sat, 10 Jun 2017 21:07:42 +0200 Subject: [PATCH] Update version --- CMakeLists.txt | 7 +------ libgamestream/CMakeLists.txt | 8 +++++--- src/configuration.h.in | 8 ++++---- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index be4b79b..ed0ad30 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,13 +1,8 @@ -project(moonlight-embedded C) cmake_minimum_required(VERSION 3.1) +project(moonlight-embedded VERSION 2.4.0 LANGUAGES C) SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") include(${CMAKE_ROOT}/Modules/GNUInstallDirs.cmake) -set(MOONLIGHT_MAJOR_VERSION 2) -set(MOONLIGHT_MINOR_VERSION 3) -set(MOONLIGHT_PATCH_VERSION 0) -set(MOONLIGHT_VERSION ${MOONLIGHT_MAJOR_VERSION}.${MOONLIGHT_MINOR_VERSION}.${MOONLIGHT_PATCH_VERSION}) - aux_source_directory(./src SRC_LIST) list(APPEND SRC_LIST ./src/input/evdev.c ./src/input/mapping.c ./src/input/udev.c) diff --git a/libgamestream/CMakeLists.txt b/libgamestream/CMakeLists.txt index 23d7da9..c6ddde5 100644 --- a/libgamestream/CMakeLists.txt +++ b/libgamestream/CMakeLists.txt @@ -1,7 +1,9 @@ +set(SO_VERSION 1) + find_package(LibUUID REQUIRED) find_package(Threads REQUIRED) find_package(CURL REQUIRED) -find_package(OpenSSL 1.0.2 REQUIRED) +find_package(OpenSSL REQUIRED) find_package(EXPAT REQUIRED) pkg_check_modules(AVAHI REQUIRED avahi-client) @@ -19,8 +21,8 @@ add_library(gamestream SHARED ${GAMESTREAM_SRC_LIST}) set_property(TARGET gamestream PROPERTY C_STANDARD 99) target_link_libraries(gamestream moonlight-common) -set_target_properties(gamestream PROPERTIES SOVERSION 0 VERSION ${MOONLIGHT_VERSION}) -set_target_properties(moonlight-common PROPERTIES SOVERSION 0 VERSION ${MOONLIGHT_VERSION}) +set_target_properties(gamestream PROPERTIES SOVERSION ${SO_VERSION} VERSION ${PROJECT_VERSION}) +set_target_properties(moonlight-common PROPERTIES SOVERSION ${SO_VERSION} VERSION ${PROJECT_VERSION}) target_include_directories(gamestream PRIVATE ../third_party/moonlight-common-c/src ../third_party/h264bitstream ${AVAHI_INCLUDE_DIRS} ${LIBUUID_INCLUDE_DIRS}) target_include_directories(moonlight-common PRIVATE ../third_party/moonlight-common-c/reedsolomon ${ENET_INCLUDE_DIRS}) diff --git a/src/configuration.h.in b/src/configuration.h.in index 1da5c11..e329365 100644 --- a/src/configuration.h.in +++ b/src/configuration.h.in @@ -1,7 +1,7 @@ /* * This file is part of Moonlight Embedded. * - * Copyright (C) 2015 Iwan Timmer + * Copyright (C) 2015-2017 Iwan Timmer * * Moonlight is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,8 +17,8 @@ * along with Moonlight; if not, see . */ -#define VERSION_MAJOR @MOONLIGHT_MAJOR_VERSION@ -#define VERSION_MINOR @MOONLIGHT_MINOR_VERSION@ -#define VERSION_PATCH @MOONLIGHT_PATCH_VERSION@ +#define VERSION_MAJOR @PROJECT_VERSION_MAJOR@ +#define VERSION_MINOR @PROJECT_VERSION_MINOR@ +#define VERSION_PATCH @PROJECT_VERSION_PATCH@ #define COMPILE_OPTIONS "@MOONLIGHT_OPTIONS@"