aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/travis-emscripten/build_emscripten.sh
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2018-04-23 21:39:14 +0800
committerGitHub <noreply@github.com>2018-04-23 21:39:14 +0800
commitc7ee2ca0b9eb6c36ddb15b70f341975bdff47aad (patch)
tree8e05d4feae3fbb1389911af6561681f41f62c51e /scripts/travis-emscripten/build_emscripten.sh
parent2fae248dbe50bed93268529724c1e3691f3c4a3f (diff)
parentfa2a28abc2484390a97c83af58646e4327673e96 (diff)
downloaddexon-solidity-c7ee2ca0b9eb6c36ddb15b70f341975bdff47aad.tar
dexon-solidity-c7ee2ca0b9eb6c36ddb15b70f341975bdff47aad.tar.gz
dexon-solidity-c7ee2ca0b9eb6c36ddb15b70f341975bdff47aad.tar.bz2
dexon-solidity-c7ee2ca0b9eb6c36ddb15b70f341975bdff47aad.tar.lz
dexon-solidity-c7ee2ca0b9eb6c36ddb15b70f341975bdff47aad.tar.xz
dexon-solidity-c7ee2ca0b9eb6c36ddb15b70f341975bdff47aad.tar.zst
dexon-solidity-c7ee2ca0b9eb6c36ddb15b70f341975bdff47aad.zip
Merge pull request #3467 from aarlt/strict-mode-jsoncpp-1.8.4
cmake/jsoncpp.cmake: update to jsoncpp v1.8.4
Diffstat (limited to 'scripts/travis-emscripten/build_emscripten.sh')
-rwxr-xr-xscripts/travis-emscripten/build_emscripten.sh10
1 files changed, 10 insertions, 0 deletions
diff --git a/scripts/travis-emscripten/build_emscripten.sh b/scripts/travis-emscripten/build_emscripten.sh
index fd643429..f49ff5b2 100755
--- a/scripts/travis-emscripten/build_emscripten.sh
+++ b/scripts/travis-emscripten/build_emscripten.sh
@@ -40,6 +40,12 @@ if ! type git &>/dev/null; then
apt-get -y install git-core
fi
+if ! type wget &>/dev/null; then
+ # We need wget to install cmake
+ apt-get update
+ apt-get -y install wget
+fi
+
WORKSPACE=/root/project
# Increase nodejs stack size
@@ -67,6 +73,10 @@ rm -rf b2 libs doc tools more bin.v2 status
)
echo -en 'travis_fold:end:compiling_boost\\r'
+echo -en 'travis_fold:start:install_cmake.sh\\r'
+source $WORKSPACE/scripts/install_cmake.sh
+echo -en 'travis_fold:end:install_cmake.sh\\r'
+
# Build dependent components and solidity itself
echo -en 'travis_fold:start:compiling_solidity\\r'
cd $WORKSPACE