Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lua libs and headers are looking for the lua versions in the same order 

static libs disabled for arch
This commit is contained in:
Sebastian Riedel 2013-12-30 21:46:45 +01:00
parent 2c788e074a
commit b9ca5a1902
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build-mg.sh
View File

@ -140,6 +140,10 @@ case $distribution in
;;
esac
;;
Arch)
echo 'Turning ON dynamic LIBS ...'
EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DWANT_STATIC_LIBS=OFF"
;;
esac
#exit 1;

4
mk/cmake/Modules/FindLUA.cmake
View File

@ -20,8 +20,8 @@ ENDIF(LUA_INCLUDE_DIR AND LUA_LIBRARIES)
FIND_PATH(LUA_INCLUDE_DIR NAMES lua.hpp
PATHS /usr/include
/usr/include/lua
/usr/include/lua5.2
/usr/include/lua
/usr/include/lua5.1
IF(FreeBSD)
SET(PATHS "/usr/local/include/lua51")
@ -30,7 +30,7 @@ FIND_PATH(LUA_INCLUDE_DIR NAMES lua.hpp
)
IF (LUA_STATIC AND NOT LUA_LIBRARIES)
FIND_LIBRARY(LUA_LIBRARIES NAMES liblua5.2.a liblua.a liblua5.1.a lua5.1 lua
FIND_LIBRARY(LUA_LIBRARIES NAMES liblua5.2.a liblua.a liblua5.1.a lua5.2 lua lua5.1
PATHS
IF(FreeBSD)
SET(PATHS "/usr/local/lib/lua51")