forked from github/server
remove remainder of custom tolua build
This commit is contained in:
parent
b63d5e31ac
commit
a17191eb56
1 changed files with 0 additions and 23 deletions
23
s/cmake-init
23
s/cmake-init
|
@ -109,29 +109,6 @@ SET (CMAKE_LIBRARY_PATH "$LIBRARY_PATH" CACHE PATH "")
|
||||||
SET (CMAKE_PREFIX_PATH "$PREFIX_PATH" CACHE PATH "")
|
SET (CMAKE_PREFIX_PATH "$PREFIX_PATH" CACHE PATH "")
|
||||||
HEREDOC
|
HEREDOC
|
||||||
|
|
||||||
path="$(which tolua)"
|
|
||||||
if [ "$HAVE_TOLUA" = "0" ] || [ -z $path ] ; then
|
|
||||||
echo "tolua is not installed, building from source"
|
|
||||||
cd $ROOT
|
|
||||||
if [ ! -d tolua/include ]; then
|
|
||||||
echo "fetching tolua from github..."
|
|
||||||
git clone https://github.com/ennorehling/tolua.git tolua
|
|
||||||
cd tolua
|
|
||||||
else
|
|
||||||
cd tolua
|
|
||||||
git pull --rebase
|
|
||||||
fi
|
|
||||||
echo "building tolua..."
|
|
||||||
make
|
|
||||||
cd -
|
|
||||||
cat >> $BUILD/config.cmake <<TOLUA
|
|
||||||
SET(PC_TOLUA_DIR "$ROOT/tolua" CACHE PATH "tolua root")
|
|
||||||
TOLUA
|
|
||||||
else
|
|
||||||
echo "tolua is $path"
|
|
||||||
fi
|
|
||||||
unset path
|
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
cd $BIN_DIR
|
cd $BIN_DIR
|
||||||
|
|
Loading…
Reference in a new issue