Merge pull request #349 from FelixPetriconi/develop

Prepare 1.5.5 release
stlab · Jan 29, 2021 · 31f2c71 · 31f2c71
2 parents 6c8c13c + 49e1742
commit 31f2c71
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,7 +14,7 @@ else()
   set( subproject OFF )
 endif()
 
-project( stlab VERSION 1.5.4 LANGUAGES CXX )
+project( stlab VERSION 1.5.5 LANGUAGES CXX )
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)

diff --git a/conanfile.py b/conanfile.py
@@ -14,7 +14,7 @@ def option_on_off(option):
 
 class StlabLibrariesConan(ConanFile):
     name = "stlab"
-    version = "1.5.4"       #TODO(fernando): see how to automate the version number
+    version = "1.5.5"       #TODO(fernando): see how to automate the version number
     license = "http://www.boost.org/users/license.html"
     url = "https://github.com/stlab/libraries"
     description = "Software Technology Lab (stlab) libraries"

diff --git a/stlab/version.hpp b/stlab/version.hpp
@@ -19,13 +19,13 @@
 //  STLAB_VERSION / 100 % 1000 is the minor version
 //  STLAB_VERSION / 100000 is the major version
 
-#define STLAB_VERSION 100504
+#define STLAB_VERSION 100505
 
 //
 //  STLAB_LIB_VERSION must be defined to be the same as STLAB_VERSION
 //  but as a *string* in the form "x_y[_z]" where x is the major version
 //  number, y is the minor version number, and z is the patch level if not 0.
 
-#define STLAB_LIB_VERSION "1_5_4"
+#define STLAB_LIB_VERSION "1_5_5"
 
 #endif