diff options
| author | Alexander Arlt <alexander.arlt@arlt-labs.com> | 2018-02-28 02:06:33 +0800 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2018-04-23 18:10:39 +0800 |
| commit | a49dac8057f3e48984585aed4f7c7f8050d25471 (patch) | |
| tree | f4975a302a4650f28545ca317eac049108756930 | |
| parent | 0b49fd34931bd27c47b2f9dea39f4c75b3b2937f (diff) | |
| download | dexon-solidity-a49dac8057f3e48984585aed4f7c7f8050d25471.tar.gz dexon-solidity-a49dac8057f3e48984585aed4f7c7f8050d25471.tar.zst dexon-solidity-a49dac8057f3e48984585aed4f7c7f8050d25471.zip | |
Install & use cmake provided by scripts/install_cmake.sh for emscripten
| -rwxr-xr-x | scripts/install_cmake.sh | 2 | ||||
| -rwxr-xr-x | scripts/travis-emscripten/build_emscripten.sh | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/scripts/install_cmake.sh b/scripts/install_cmake.sh index 00d013b9..e334b2c9 100755 --- a/scripts/install_cmake.sh +++ b/scripts/install_cmake.sh @@ -18,6 +18,8 @@ esac BIN=$PREFIX/bin +PATH=$PREFIX/bin:$PATH + if test -f $BIN/cmake && ($BIN/cmake --version | grep -q "$VERSION"); then echo "CMake $VERSION already installed in $BIN" else 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 |