diff options
author | Derek Sollenberger <djsollen@google.com> | 2016-01-11 14:41:40 -0500 |
---|---|---|
committer | Derek Sollenberger <djsollen@google.com> | 2016-01-11 20:20:14 +0000 |
commit | 2eb3b4d7ea1a3cbb0f8775de3b6d92c0a6152f9f (patch) | |
tree | 58b7078bd9f0353e4f34119ff3dce5e1b989ab2d /dev.makefile | |
parent | 7daccb3a43871796f8f6c4f70e3b8be79e7e65b2 (diff) | |
download | jsoncpp-2eb3b4d7ea1a3cbb0f8775de3b6d92c0a6152f9f.tar.gz |
Upgrade jsoncpp to version 1.0.0 to match the copy used by Skia's testing tools.
This mirrors the contents of the upstream repository at...
https://github.com/open-source-parsers/jsoncpp/commit/7165f6ac4c482e68475c9e1dac086f9e12fff0d0
Bug: 17997234
Change-Id: I87a8312f9d030e5027f4ca5b1568f8374a856632
Diffstat (limited to 'dev.makefile')
-rw-r--r-- | dev.makefile | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/dev.makefile b/dev.makefile new file mode 100644 index 0000000..dd16bdd --- /dev/null +++ b/dev.makefile @@ -0,0 +1,14 @@ +all: build test-amalgamate + +build: + mkdir -p build/debug + cd build/debug; cmake -DCMAKE_BUILD_TYPE=debug -DJSONCPP_LIB_BUILD_SHARED=ON -G "Unix Makefiles" ../.. + make -C build/debug + +# Currently, this depends on include/json/version.h generated +# by cmake. +test-amalgamate: build + python2.7 amalgamate.py + python3.4 amalgamate.py + +.PHONY: build |