From 078f991c576d32fb55d7ae02ed5e131690aa884c Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Sat, 7 Mar 2015 14:51:29 -0600 Subject: [PATCH] 1.5.4 <- 1.5.3 important bug-fix (thx to datadiode@) --- CMakeLists.txt | 2 +- include/json/version.h | 4 ++-- version | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a03dad1..cf770f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,7 +60,7 @@ ENDMACRO(jsoncpp_parse_version) #SET( JSONCPP_VERSION_MAJOR X ) #SET( JSONCPP_VERSION_MINOR Y ) #SET( JSONCPP_VERSION_PATCH Z ) -SET( JSONCPP_VERSION 1.5.3 ) +SET( JSONCPP_VERSION 1.5.4 ) 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") diff --git a/include/json/version.h b/include/json/version.h index 9020abb..1b23ae1 100644 --- a/include/json/version.h +++ b/include/json/version.h @@ -4,10 +4,10 @@ #ifndef JSON_VERSION_H_INCLUDED # define JSON_VERSION_H_INCLUDED -# define JSONCPP_VERSION_STRING "1.5.3" +# define JSONCPP_VERSION_STRING "1.5.4" # define JSONCPP_VERSION_MAJOR 1 # define JSONCPP_VERSION_MINOR 5 -# define JSONCPP_VERSION_PATCH 3 +# define JSONCPP_VERSION_PATCH 4 # define JSONCPP_VERSION_QUALIFIER # define JSONCPP_VERSION_HEXA ((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) | (JSONCPP_VERSION_PATCH << 8)) diff --git a/version b/version index 8af85be..94fe62c 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.5.3 +1.5.4