From e9543de4c3d29562fcd5fc972881278811e04dea Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Tue, 27 Jan 2015 12:18:36 -0600 Subject: [PATCH] 0.10.z (based on 1.6.z, but binary-compat w/ 0.6.0-rc2) --- CMakeLists.txt | 2 +- include/json/version.h | 6 +++--- version | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 462f278..677c2d5 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.6.1 ) +SET( JSONCPP_VERSION 0.10.1 ) 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 515c51b..5245a3d 100644 --- a/include/json/version.h +++ b/include/json/version.h @@ -4,9 +4,9 @@ #ifndef JSON_VERSION_H_INCLUDED # define JSON_VERSION_H_INCLUDED -# define JSONCPP_VERSION_STRING "1.6.1" -# define JSONCPP_VERSION_MAJOR 1 -# define JSONCPP_VERSION_MINOR 6 +# define JSONCPP_VERSION_STRING "0.10.1" +# define JSONCPP_VERSION_MAJOR 0 +# define JSONCPP_VERSION_MINOR 10 # define JSONCPP_VERSION_PATCH 1 # 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 9c6d629..5712157 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.6.1 +0.10.1