Merge pull request #660 from SloCompTech/master

fixes #659
fixes #661
This commit is contained in:
Christopher Dunn 2017-09-05 02:58:50 -05:00 committed by GitHub
commit adb9ab1424
2 changed files with 7 additions and 4 deletions

View File

@ -38,12 +38,14 @@ First, install both meson (which requires Python3) and ninja.
Then,
cd jsoncpp/
BUILD_TYPE=shared
#BUILD_TYPE=static
LIB_TYPE=debug
#LIB_TYPE=release
BUILD_TYPE=debug
#BUILD_TYPE=release
LIB_TYPE=shared
#LIB_TYPE=static
meson --buildtype ${BUILD_TYPE} --default-library ${LIB_TYPE} . build-${LIB_TYPE}
ninja -v -C build-${LIB_TYPE} test
cd build-${LIB_TYPE}
sudo ninja install
### Building and testing with other build systems
See https://github.com/open-source-parsers/jsoncpp/wiki/Building

View File

@ -18,6 +18,7 @@ jsoncpp_cdata.set('JSONCPP_VERSION', meson.project_version())
jsoncpp_cdata.set('JSONCPP_VERSION_MAJOR', jsoncpp_major_version)
jsoncpp_cdata.set('JSONCPP_VERSION_MINOR', jsoncpp_minor_version)
jsoncpp_cdata.set('JSONCPP_VERSION_PATCH', jsoncpp_patch_version)
jsoncpp_cdata.set('JSONCPP_USE_SECURE_MEMORY',0)
jsoncpp_gen_sources = configure_file(
input : 'src/lib_json/version.h.in',