Skip to content

Commit f700fe4

Browse files
committed
Require cmake>=3.1
Plus some other build-related changes. I don't think there is anything functionally different from 1.7.7, or even any binary incompatibilities, but the cmake change is significant.
1 parent d167a09 commit f700fe4

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ ENDMACRO()
5959
#SET( JSONCPP_VERSION_MAJOR X )
6060
#SET( JSONCPP_VERSION_MINOR Y )
6161
#SET( JSONCPP_VERSION_PATCH Z )
62-
SET( JSONCPP_VERSION 1.7.7 )
62+
SET( JSONCPP_VERSION 1.8.0 )
6363
jsoncpp_parse_version( ${JSONCPP_VERSION} JSONCPP_VERSION )
6464
#IF(NOT JSONCPP_VERSION_FOUND)
6565
# MESSAGE(FATAL_ERROR "Failed to parse version string properly. Expect X.Y.Z")

include/json/version.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
#ifndef JSON_VERSION_H_INCLUDED
44
# define JSON_VERSION_H_INCLUDED
55

6-
# define JSONCPP_VERSION_STRING "1.7.7"
6+
# define JSONCPP_VERSION_STRING "1.8.0"
77
# define JSONCPP_VERSION_MAJOR 1
8-
# define JSONCPP_VERSION_MINOR 7
9-
# define JSONCPP_VERSION_PATCH 7
8+
# define JSONCPP_VERSION_MINOR 8
9+
# define JSONCPP_VERSION_PATCH 0
1010
# define JSONCPP_VERSION_QUALIFIER
1111
# define JSONCPP_VERSION_HEXA ((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) | (JSONCPP_VERSION_PATCH << 8))
1212

version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.7.7
1+
1.8.0

0 commit comments

Comments
 (0)