diff options
| author | Ferdinand Thiessen <rpm@fthiessen.de> | 2015-12-03 21:18:39 +0100 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2015-12-05 23:31:09 +0100 |
| commit | 70ece71ee4e8f8bff5cbc572710c0fa6fc3b355f (patch) | |
| tree | 3ae8a0950287f694fe9c61a673b418a04b435791 /cmake/Modules/FindLua.cmake | |
| parent | 5643b9b9ed3ec39f90e3a7c9bf09bc255e0bcef3 (diff) | |
| download | minetest-70ece71ee4e8f8bff5cbc572710c0fa6fc3b355f.tar.gz minetest-70ece71ee4e8f8bff5cbc572710c0fa6fc3b355f.tar.bz2 minetest-70ece71ee4e8f8bff5cbc572710c0fa6fc3b355f.zip | |
Improve LuaJIT detection
On openSUSE luajit is not detected correctly.
This is because openSUSE is using a lua version suffix, like other Linux distributions do it also.
So the include directory is:
include/luajit-5_1-2.0
Diffstat (limited to 'cmake/Modules/FindLua.cmake')
| -rw-r--r-- | cmake/Modules/FindLua.cmake | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/cmake/Modules/FindLua.cmake b/cmake/Modules/FindLua.cmake deleted file mode 100644 index 479dfcf41..000000000 --- a/cmake/Modules/FindLua.cmake +++ /dev/null @@ -1,25 +0,0 @@ - -option(ENABLE_LUAJIT "Enable LuaJIT support" TRUE) -mark_as_advanced(LUA_LIBRARY LUA_INCLUDE_DIR) -set(USE_LUAJIT FALSE) - -if(ENABLE_LUAJIT) - find_library(LUA_LIBRARY luajit - NAMES luajit-5.1) - find_path(LUA_INCLUDE_DIR luajit.h - NAMES luajit.h - PATH_SUFFIXES luajit-2.0) - if(LUA_LIBRARY AND LUA_INCLUDE_DIR) - set(USE_LUAJIT TRUE) - endif() -else() - message (STATUS "LuaJIT detection disabled! (ENABLE_LUAJIT=0)") -endif() - -if(NOT USE_LUAJIT) - message(STATUS "LuaJIT not found, using bundled Lua.") - set(LUA_LIBRARY "lua") - set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src") - add_subdirectory(lua) -endif() - |