Merge pull request #4 from dabascht/master
lua libs and headers found in right order / arch dynamic libs
This commit is contained in:
commit
6c9f658ea6
|
@ -140,6 +140,10 @@ case $distribution in
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
|
Arch)
|
||||||
|
echo 'Turning ON dynamic LIBS ...'
|
||||||
|
EXTRA_CMAKE_OPTIONS="${EXTRA_CMAKE_OPTIONS} -DWANT_STATIC_LIBS=OFF"
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
#exit 1;
|
#exit 1;
|
||||||
|
|
|
@ -20,8 +20,8 @@ ENDIF(LUA_INCLUDE_DIR AND LUA_LIBRARIES)
|
||||||
|
|
||||||
FIND_PATH(LUA_INCLUDE_DIR NAMES lua.hpp
|
FIND_PATH(LUA_INCLUDE_DIR NAMES lua.hpp
|
||||||
PATHS /usr/include
|
PATHS /usr/include
|
||||||
/usr/include/lua
|
|
||||||
/usr/include/lua5.2
|
/usr/include/lua5.2
|
||||||
|
/usr/include/lua
|
||||||
/usr/include/lua5.1
|
/usr/include/lua5.1
|
||||||
IF(FreeBSD)
|
IF(FreeBSD)
|
||||||
SET(PATHS "/usr/local/include/lua51")
|
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)
|
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
|
PATHS
|
||||||
IF(FreeBSD)
|
IF(FreeBSD)
|
||||||
SET(PATHS "/usr/local/lib/lua51")
|
SET(PATHS "/usr/local/lib/lua51")
|
||||||
|
|
Loading…
Reference in New Issue