Merge https://github.com/open-source-parsers/jsoncpp

Author: ssbr

.gitignore

@@ -1,12 +1,12 @@
 /build/
+/build-*/
 *.pyc
 *.swp
 *.actual
 *.actual-rewrite
 *.process-output
 *.rewrite
 /bin/
-/buildscons/
 /libs/
 /doc/doxyfile
 /dist/
@@ -31,7 +31,7 @@
 # CMake-generated files:
 CMakeFiles/
 *.cmake
-pkg-config/jsoncpp.pc
+/pkg-config/jsoncpp.pc
 jsoncpp_lib_static.dir/
 
 # In case someone runs cmake in the root-dir:

.travis.yml

@@ -38,6 +38,7 @@ addons:
     - g++-4.9
     - clang-3.5
     - valgrind
+    - python3
 os:
   - linux
 language: cpp

CMakeLists.txt

@@ -59,12 +59,12 @@ ENDMACRO()
 #SET( JSONCPP_VERSION_MAJOR X )
 #SET( JSONCPP_VERSION_MINOR Y )
 #SET( JSONCPP_VERSION_PATCH Z )
-SET( JSONCPP_VERSION 1.8.1 )
+SET( JSONCPP_VERSION 1.8.3 )
 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_SOVERSION 19 )
 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}")