Merge pull request #652 from cdunn2001/meson-not-scons

Meson not scons; 1.8.2<-1.8.1
open-source-parsers · Aug 27, 2017 · 4cfae89 · 4cfae89
2 parents 5331d29 + f4ec601
commit 4cfae89
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 1,024 deletions.
diff --git a/.gitignore b/.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:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -59,7 +59,7 @@ 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.2 )
 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/NEWS.txt b/NEWS.txt