From a8c957693716139f2e9183f5ba7de57cb0269bf6 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 4 Feb 2018 14:59:01 +0100 Subject: [PATCH] fix mac build --- s/cmake-init | 10 ++++++---- src/CMakeLists.txt | 3 +-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/s/cmake-init b/s/cmake-init index 2a3e97fc4..5da7e985f 100755 --- a/s/cmake-init +++ b/s/cmake-init @@ -51,7 +51,7 @@ LUA_DIR=/usr if [ -d /usr/include/lua5.1 ]; then LUA_VERSION="5.1" elif [ -d /usr/local/include/lua5.1 ]; then - LUA_DIR=/usr/local + export LUA_DIR=/usr/local LUA_VERSION="5.1" fi @@ -64,8 +64,6 @@ SET (CMAKE_LIBRARY_PATH "$LIBRARY_PATH" CACHE PATH "") SET (CMAKE_PREFIX_PATH "$PREFIX_PATH" CACHE PATH "") HEREDOC -#echo 'SET (LUA_DIR "$LUA_DIR" PATH)' >> $BUILD/config.cmake - path="$(which tolua)" if [ "$HAVE_TOLUA" = "0" ] || [ -z $path ] ; then echo "tolua is not installed, building from source" @@ -77,7 +75,11 @@ if [ "$HAVE_TOLUA" = "0" ] || [ -z $path ] ; then echo "building tolua..." cd tolua make - echo 'SET(PC_TOLUA_DIR "$ROOT/tolua" CACHE PATH "tolua root")' >> $BUILD/config.cmake + cd - +cat >> $BUILD/config.cmake <