From 4bde0a2d36297c4b3fa17c7dac2bb1681e1e7f75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Thu, 20 Oct 2016 11:58:25 +0200 Subject: Build jsoncpp from source using jsoncpp.cmake script --- scripts/travis-emscripten/build_emscripten.sh | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'scripts/travis-emscripten/build_emscripten.sh') diff --git a/scripts/travis-emscripten/build_emscripten.sh b/scripts/travis-emscripten/build_emscripten.sh index 285c6338..17a40e1c 100755 --- a/scripts/travis-emscripten/build_emscripten.sh +++ b/scripts/travis-emscripten/build_emscripten.sh @@ -52,20 +52,6 @@ rm -rf .git ) echo -en 'travis_fold:end:compiling_cryptopp\\r' -# Json-CPP -echo -en 'travis_fold:start:compiling_jsoncpp\\r' -cd "$WORKSPACE/jsoncpp" -# if .git exists, it is a fresh checkout, otherwise it comes from the cache -# and is already compiled -test -e .git && ( -emcmake cmake -DJSONCPP_LIB_BUILD_STATIC=ON -DJSONCPP_LIB_BUILD_SHARED=OFF \ - -DJSONCPP_WITH_TESTS=OFF -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF \ - -G "Unix Makefiles" . -emmake make -j 4 -rm -rf .git -) -echo -en 'travis_fold:end:compiling_jsoncpp\\r' - # Boost echo -en 'travis_fold:start:compiling_boost\\r' cd "$WORKSPACE"/boost_1_57_0 @@ -112,8 +98,6 @@ emcmake cmake \ -DBoost_THREAD_LIBRARIES="$WORKSPACE"/boost_1_57_0/libboost_thread.a \ -DBoost_UNIT_TEST_FRAMEWORK_LIBRARY="$WORKSPACE"/boost_1_57_0/libboost_unit_test_framework.a \ -DBoost_UNIT_TEST_FRAMEWORK_LIBRARIES="$WORKSPACE"/boost_1_57_0/libboost_unit_test_framework.a \ - -DJSONCPP_LIBRARY="$WORKSPACE"/jsoncpp/src/lib_json/libjsoncpp.a \ - -DJSONCPP_INCLUDE_DIR="$WORKSPACE"/jsoncpp/include/ \ -DCRYPTOPP_LIBRARY="$WORKSPACE"/cryptopp/src/libcryptlib.a \ -DCRYPTOPP_INCLUDE_DIR="$WORKSPACE"/cryptopp/src/ \ -DDev_DEVCORE_LIBRARY="$WORKSPACE"/solidity/build/libdevcore/libsoldevcore.a \ -- cgit v1.2.3