Merge pull request #53 from eXpl0it3r/feature/version_2.2

Updated CSFML's version to 2.2.0.
SFML · Mar 3, 2015 · 141fbf5 · 141fbf5
2 parents 944b267 + aad6f7b
commit 141fbf5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
 
 
 ////////////////////////////////////////////////////////////