From aad6f7b2d151f925646130b58f3b86c0515b2450 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20D=C3=BCrrenberger?= Date: Tue, 6 Jan 2015 15:58:53 +0100 Subject: [PATCH] Updated CSFML's version to 2.2.0. --- CMakeLists.txt | 2 +- cmake/Macros.cmake | 4 ++-- doc/doxyfile.in | 2 +- include/SFML/Config.h | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a691c5b..a8e9840 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ include(${CMAKE_SOURCE_DIR}/cmake/Config.cmake) # setup version numbers set(VERSION_MAJOR 2) -set(VERSION_MINOR 1) +set(VERSION_MINOR 2) set(VERSION_PATCH 0) # add the CSFML header path diff --git a/cmake/Macros.cmake b/cmake/Macros.cmake index 8a50b46..fcbe27b 100644 --- a/cmake/Macros.cmake +++ b/cmake/Macros.cmake @@ -32,8 +32,8 @@ macro(csfml_add_library target) endif() # set the version and soversion of the target (for compatible systems -- mostly Linuxes) - set_target_properties(${target} PROPERTIES SOVERSION ${VERSION_MAJOR}) - set_target_properties(${target} PROPERTIES VERSION ${VERSION_MAJOR}.${VERSION_MINOR}) + set_target_properties(${target} PROPERTIES SOVERSION ${VERSION_MAJOR}.${VERSION_MINOR}) + set_target_properties(${target} PROPERTIES VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) # set the target's folder (for IDEs that support it, e.g. Visual Studio) set_target_properties(${target} PROPERTIES FOLDER "CSFML") diff --git a/doc/doxyfile.in b/doc/doxyfile.in index e62ed7d..72b1c82 100644 --- a/doc/doxyfile.in +++ b/doc/doxyfile.in @@ -31,7 +31,7 @@ PROJECT_NAME = SFML # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = @VERSION_MAJOR@.@VERSION_MINOR@ +PROJECT_NUMBER = @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@ # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/include/SFML/Config.h b/include/SFML/Config.h index 90c39ed..1f94147 100644 --- a/include/SFML/Config.h +++ b/include/SFML/Config.h @@ -30,7 +30,8 @@ // Define the CSFML version //////////////////////////////////////////////////////////// #define CSFML_VERSION_MAJOR 2 -#define CSFML_VERSION_MINOR 1 +#define CSFML_VERSION_MINOR 2 +#define CSFML_VERSION_PATCH 0 ////////////////////////////////////////////////////////////