From ee1f26ee04eb6540034de44ccf23dcb51e4ea589 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Thu, 28 Apr 2022 21:36:11 +0300 Subject: [PATCH] Modernize project version handling in CMake --- CMakeLists.txt | 8 +------- SDL2pp/Config.hh.in | 10 +++++----- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cad57d7..9c16744 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,16 +1,10 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR) # meta -project(libSDL2pp) +project(libSDL2pp LANGUAGES CXX VERSION 0.16.2) set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) -set(SDL2PP_MAJOR_VERSION 0) -set(SDL2PP_MINOR_VERSION 16) -set(SDL2PP_PATCH_VERSION 2) - -set(SDL2PP_VERSION "${SDL2PP_MAJOR_VERSION}.${SDL2PP_MINOR_VERSION}.${SDL2PP_PATCH_VERSION}") - set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED YES) set(CMAKE_CXX_EXTENSIONS NO) diff --git a/SDL2pp/Config.hh.in b/SDL2pp/Config.hh.in index f358edd..100d389 100644 --- a/SDL2pp/Config.hh.in +++ b/SDL2pp/Config.hh.in @@ -1,6 +1,6 @@ /* libSDL2pp - C++11 bindings/wrapper for SDL2 - Copyright (C) 2014-2016 Dmitry Marakasov + Copyright (C) 2014-2016,2022 Dmitry Marakasov This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -22,11 +22,11 @@ #ifndef SDL2PP_CONFIG_HH #define SDL2PP_CONFIG_HH -#define SDL2PP_MAJOR_VERSION @SDL2PP_MAJOR_VERSION@ -#define SDL2PP_MINOR_VERSION @SDL2PP_MINOR_VERSION@ -#define SDL2PP_PATCH_VERSION @SDL2PP_PATCH_VERSION@ +#define SDL2PP_MAJOR_VERSION @libSDL2pp_VERSION_MAJOR@ +#define SDL2PP_MINOR_VERSION @libSDL2pp_VERSION_MINOR@ +#define SDL2PP_PATCH_VERSION @libSDL2pp_VERSION_PATCH@ -#define SDL2PP_VERSION "@SDL2PP_VERSION@" +#define SDL2PP_VERSION "@libSDL2pp_VERSION@" #cmakedefine SDL2PP_WITH_IMAGE #cmakedefine SDL2PP_WITH_TTF