From c98e1d85e3ef2d46294e21daf0f2e1bfcc7f24a3 Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Mon, 28 Aug 2017 08:45:17 -0500 Subject: [PATCH] Bump to soversion=19, 1.8.3 Note that cmake is deprecated, but we keep it in-sync manually for now. --- CMakeLists.txt | 4 ++-- include/json/version.h | 4 ++-- meson.build | 4 ++-- version | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bf0e1e6..0cfaf53 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,12 +59,12 @@ ENDMACRO() #SET( JSONCPP_VERSION_MAJOR X ) #SET( JSONCPP_VERSION_MINOR Y ) #SET( JSONCPP_VERSION_PATCH Z ) -SET( JSONCPP_VERSION 1.8.2 ) +SET( JSONCPP_VERSION 1.8.3 ) jsoncpp_parse_version( ${JSONCPP_VERSION} JSONCPP_VERSION ) #IF(NOT JSONCPP_VERSION_FOUND) # MESSAGE(FATAL_ERROR "Failed to parse version string properly. Expect X.Y.Z") #ENDIF(NOT JSONCPP_VERSION_FOUND) -SET( JSONCPP_SOVERSION 11 ) +SET( JSONCPP_SOVERSION 19 ) SET( JSONCPP_USE_SECURE_MEMORY "0" CACHE STRING "-D...=1 to use memory-wiping allocator for STL" ) MESSAGE(STATUS "JsonCpp Version: ${JSONCPP_VERSION_MAJOR}.${JSONCPP_VERSION_MINOR}.${JSONCPP_VERSION_PATCH}") diff --git a/include/json/version.h b/include/json/version.h index d953961..b1d2a5f 100644 --- a/include/json/version.h +++ b/include/json/version.h @@ -3,10 +3,10 @@ #ifndef JSON_VERSION_H_INCLUDED # define JSON_VERSION_H_INCLUDED -# define JSONCPP_VERSION_STRING "1.8.2" +# define JSONCPP_VERSION_STRING "1.8.3" # define JSONCPP_VERSION_MAJOR 1 # define JSONCPP_VERSION_MINOR 8 -# define JSONCPP_VERSION_PATCH 2 +# define JSONCPP_VERSION_PATCH 3 # define JSONCPP_VERSION_QUALIFIER # define JSONCPP_VERSION_HEXA ((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) | (JSONCPP_VERSION_PATCH << 8)) diff --git a/meson.build b/meson.build index 010e06b..f2a6800 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project( 'jsoncpp', 'cpp', - version : '1.8.2', + version : '1.8.3', default_options : [ 'buildtype=release', 'warning_level=1'], @@ -52,7 +52,7 @@ jsoncpp_lib = library( 'src/lib_json/json_reader.cpp', 'src/lib_json/json_value.cpp', 'src/lib_json/json_writer.cpp'], - soversion : 18, + soversion : 19, install : true, include_directories : jsoncpp_include_directories) diff --git a/version b/version index 53adb84..a7ee35a 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.8.2 +1.8.3