diff options
| author | Weblate <42@minetest.ru> | 2013-04-18 20:00:16 +0200 |
|---|---|---|
| committer | Weblate <42@minetest.ru> | 2013-04-18 20:00:16 +0200 |
| commit | 9e6376bd95ba9309365b39b878ab2f499776437a (patch) | |
| tree | a354a250daedf036cc36e33d3d1ebb9fafc4ac27 /src/CMakeLists.txt | |
| parent | e385af7cc01d156164b85d10b00a7047a5372e66 (diff) | |
| parent | e60eb32050a44d344795e4a1515a56038bb97e02 (diff) | |
| download | minetest-9e6376bd95ba9309365b39b878ab2f499776437a.tar.gz minetest-9e6376bd95ba9309365b39b878ab2f499776437a.tar.bz2 minetest-9e6376bd95ba9309365b39b878ab2f499776437a.zip | |
Merge remote branch 'origin/master'
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9bef3289e..7ddeeb02e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -180,10 +180,26 @@ if(USE_FREETYPE) set(CGUITTFONT_LIBRARY cguittfont) endif(USE_FREETYPE) -# Do not use system-wide installation of Lua, because it'll likely be a -# different version and/or has different build options. -set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src") -set(LUA_LIBRARY "lua") + +find_library(LUA_LIBRARY luajit + NAMES luajit-5.1) +find_path(LUA_INCLUDE_DIR luajit.h + NAMES luajit.h + PATH_SUFFIXES luajit-2.0) +message (STATUS "LuaJIT library: ${LUA_LIBRARY}") +message (STATUS "LuaJIT headers: ${LUA_INCLUDE_DIR}") + +if(LUA_LIBRARY AND LUA_INCLUDE_DIR) + message (STATUS "LuaJIT found.") +else(LUA_LIBRARY AND LUA_INCLUDE_DIR) + message (STATUS "LuaJIT not found, using bundled Lua.") + set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src") + set(LUA_LIBRARY "lua") + add_subdirectory(lua) +endif(LUA_LIBRARY AND LUA_INCLUDE_DIR) + +mark_as_advanced(LUA_LIBRARY) +mark_as_advanced(LUA_INCLUDE_DIR) configure_file( "${PROJECT_SOURCE_DIR}/cmake_config.h.in" @@ -311,6 +327,7 @@ set(minetest_SRCS particles.cpp clientobject.cpp chat.cpp + hud.cpp guiMainMenu.cpp guiKeyChangeMenu.cpp guiMessageMenu.cpp @@ -601,11 +618,6 @@ if (BUILD_CLIENT AND USE_FREETYPE) add_subdirectory(cguittfont) endif (BUILD_CLIENT AND USE_FREETYPE) -if (LUA_FOUND) -else (LUA_FOUND) - add_subdirectory(lua) -endif (LUA_FOUND) - if (JSON_FOUND) else (JSON_FOUND) add_subdirectory(json) |