cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Install & use cmake provided by scripts/install_cmake.sh for emscripten

Browse Source
This commit is contained in:
Alexander Arlt 2018-02-27 19:06:33 +01:00 committed by Alex Beregszaszi
parent 0b49fd3493
commit a49dac8057
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/install_cmake.sh
View File

@ -18,6 +18,8 @@ esac
BIN=$PREFIX/bin BIN=$PREFIX/bin
PATH=$PREFIX/bin:$PATH
if test -f $BIN/cmake && ($BIN/cmake --version | grep -q "$VERSION"); then if test -f $BIN/cmake && ($BIN/cmake --version | grep -q "$VERSION"); then
echo "CMake $VERSION already installed in $BIN" echo "CMake $VERSION already installed in $BIN"
else else

10
scripts/travis-emscripten/build_emscripten.sh
View File

@ -40,6 +40,12 @@ if ! type git &>/dev/null; then
apt-get -y install git-core apt-get -y install git-core
fi 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 WORKSPACE=/root/project
# Increase nodejs stack size # 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: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 # Build dependent components and solidity itself
echo -en 'travis_fold:start:compiling_solidity\\r' echo -en 'travis_fold:start:compiling_solidity\\r'
cd $WORKSPACE cd $WORKSPACE