diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2017-04-07 23:56:02 +0200 |
|---|---|---|
| committer | Loic Blot <loic.blot@unix-experience.fr> | 2017-04-07 23:56:02 +0200 |
| commit | ff4fef570e8df6ce44ceb1d9071f860474eb1f95 (patch) | |
| tree | 601fc6ddfe72106f82e2ec6bac1c9abf854bccfa /lib | |
| parent | 4af99b75cf3ae43c365a4c1e90e85f8ec764cf62 (diff) | |
| download | minetest-ff4fef570e8df6ce44ceb1d9071f860474eb1f95.tar.gz minetest-ff4fef570e8df6ce44ceb1d9071f860474eb1f95.tar.bz2 minetest-ff4fef570e8df6ce44ceb1d9071f860474eb1f95.zip | |
Fix cmake library default build problem since moving to lib/
Also make Lua library check a cmake module
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/CMakeLists.txt | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt deleted file mode 100644 index bc398f607..000000000 --- a/lib/CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ -# LuaJIT -option(ENABLE_LUAJIT "Enable LuaJIT support" TRUE) -set(USE_LUAJIT FALSE PARENT_SCOPE) -option(REQUIRE_LUAJIT "Require LuaJIT support" FALSE) -if(REQUIRE_LUAJIT) - set(ENABLE_LUAJIT TRUE) -endif() -if(ENABLE_LUAJIT) - find_package(LuaJIT) - if(LUAJIT_FOUND) - set(USE_LUAJIT TRUE) - set(USE_LUAJIT TRUE PARENT_SCOPE) - message (STATUS "Using LuaJIT provided by system.") - elseif(REQUIRE_LUAJIT) - message(FATAL_ERROR "LuaJIT not found whereas REQUIRE_LUAJIT=\"TRUE\" is used.\n" - "To continue, either install LuaJIT or do not use REQUIRE_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 PARENT_SCOPE) - set(LUA_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lua/src PARENT_SCOPE) - add_subdirectory(lua) -endif() - -find_package(GMP REQUIRED) -find_package(Json REQUIRED) |