From 9a4b1e39bf5a5dec9b7bbfe64fbbf5982902d60b Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Sat, 6 Feb 2016 10:26:59 -0600 Subject: [PATCH] 1.7.0 < 1.6.5 --- 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 1f4c1f7..1583daa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,7 +64,7 @@ ENDMACRO() #SET( JSONCPP_VERSION_MAJOR X ) #SET( JSONCPP_VERSION_MINOR Y ) #SET( JSONCPP_VERSION_PATCH Z ) -SET( JSONCPP_VERSION 1.6.5 ) +SET( JSONCPP_VERSION 1.7.0 ) 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 9df36d7..6c570a1 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.6.5" +# define JSONCPP_VERSION_STRING "1.7.0" # define JSONCPP_VERSION_MAJOR 1 -# define JSONCPP_VERSION_MINOR 6 -# define JSONCPP_VERSION_PATCH 5 +# define JSONCPP_VERSION_MINOR 7 +# define JSONCPP_VERSION_PATCH 0 # 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 9f05f9f..bd8bf88 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.6.5 +1.7.0