1.7.7

Bump SOVERSION, separate from MAJOR.MINOR.MICRO
Fix typo
2025-10-15 15:16:47 +02:00 · 2016-10-02 11:32:21 -05:00 · 2016-10-02 11:29:12 -05:00 · 2016-10-02 10:52:13 -05:00 · 2016-09-27 20:12:01 -05:00 · 2016-09-26 11:24:32 +01:00
5 changed files with 9 additions and 7 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,11 +69,12 @@ ENDMACRO()
 #SET( JSONCPP_VERSION_MAJOR X )
 #SET( JSONCPP_VERSION_MINOR Y )
 #SET( JSONCPP_VERSION_PATCH Z )
-SET( JSONCPP_VERSION 1.7.6 )
+SET( JSONCPP_VERSION 1.7.7 )
 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_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}")
--- a/include/json/config.h
+++ b/include/json/config.h
@@ -6,7 +6,8 @@
 #ifndef JSON_CONFIG_H_INCLUDED
 #define JSON_CONFIG_H_INCLUDED
 #include <stddef.h>
-#include <string> //typdef String
+#include <string> //typedef String
+#include <stdint.h> //typedef int64_t, uint64_t

 /// If defined, indicates that json library is embedded in CppTL library.
 //# define JSON_IN_CPPTL 1
--- 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.7.6"
+# define JSONCPP_VERSION_STRING "1.7.7"
 # define JSONCPP_VERSION_MAJOR 1
 # define JSONCPP_VERSION_MINOR 7
-# define JSONCPP_VERSION_PATCH 6
+# define JSONCPP_VERSION_PATCH 7
 # define JSONCPP_VERSION_QUALIFIER
 # define JSONCPP_VERSION_HEXA ((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) | (JSONCPP_VERSION_PATCH << 8))

--- a/src/lib_json/CMakeLists.txt
+++ b/src/lib_json/CMakeLists.txt
@@ -42,7 +42,7 @@ ENDIF()
 IF(BUILD_SHARED_LIBS)
    ADD_DEFINITIONS( -DJSON_DLL_BUILD )
    ADD_LIBRARY(jsoncpp_lib SHARED ${PUBLIC_HEADERS} ${jsoncpp_sources})
-    SET_TARGET_PROPERTIES( jsoncpp_lib PROPERTIES VERSION ${JSONCPP_VERSION} SOVERSION ${JSONCPP_VERSION_MAJOR})
+    SET_TARGET_PROPERTIES( jsoncpp_lib PROPERTIES VERSION ${JSONCPP_VERSION} SOVERSION ${JSONCPP_SOVERSION})
    SET_TARGET_PROPERTIES( jsoncpp_lib PROPERTIES OUTPUT_NAME jsoncpp
                           DEBUG_OUTPUT_NAME jsoncpp${DEBUG_LIBNAME_SUFFIX} )

@@ -66,7 +66,7 @@ ENDIF()

 IF(BUILD_STATIC_LIBS)
    ADD_LIBRARY(jsoncpp_lib_static STATIC ${PUBLIC_HEADERS} ${jsoncpp_sources})
-    SET_TARGET_PROPERTIES( jsoncpp_lib_static PROPERTIES VERSION ${JSONCPP_VERSION} SOVERSION ${JSONCPP_VERSION_MAJOR})
+    SET_TARGET_PROPERTIES( jsoncpp_lib_static PROPERTIES VERSION ${JSONCPP_VERSION} SOVERSION ${JSONCPP_SOVERSION})
    SET_TARGET_PROPERTIES( jsoncpp_lib_static PROPERTIES OUTPUT_NAME jsoncpp
                           DEBUG_OUTPUT_NAME jsoncpp${DEBUG_LIBNAME_SUFFIX} )

--- a/2
+++ b/2
@@ -1 +1 @@
-1.7.6
+1.7.7
Author	SHA1	Message	Date
Christopher Dunn	d8cd848ede	1.7.7	2016-10-02 11:32:21 -05:00
Christopher Dunn	92259f7147	Bump SOVERSION, separate from MAJOR.MINOR.MICRO	2016-10-02 11:29:12 -05:00
yiqiju	4a431bcdac	Fix typo resolves #538	2016-10-02 10:52:13 -05:00
Christopher Dunn	7d868636de	Merge pull request #536 from vriera/master resolves #537 closes #538	2016-09-27 20:12:01 -05:00
Vicente Olivert Riera	ab0f1e234a	Include stdint.h necessary for int64_t and uint64_t Otherwise failures like these one can happen during the configure phase of other applications that use jsoncpp, like upmpdcli for instance: checking jsoncpp/json/json.h usability... yes checking jsoncpp/json/json.h presence... yes checking for jsoncpp/json/json.h... yes configure: error: libjsoncpp not found. And this is the actual problem that you can see in config.log: configure:5233: checking for jsoncpp/json/json.h configure:5233: result: yes configure:5259: /usr/bin/mipsel-linux-g++ -o conftest conftest.cpp -lmicrohttpd -lmpdclient -lpthread -ljsoncpp >&5 In file included from /usr/include/jsoncpp/json/autolink.h:9:0, from /usr/include/jsoncpp/json/json.h:9, from conftest.cpp:26: /usr/include/jsoncpp/json/config.h:155:9: error: 'int64_t' does not name a type typedef int64_t Int64; ^ /usr/include/jsoncpp/json/config.h:156:9: error: 'uint64_t' does not name a type typedef uint64_t UInt64; ^ Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>	2016-09-26 11:24:32 +01:00
@@ -1 +1 @@
 .7.6
 .7.7