diff --git a/CMakeLists.txt b/CMakeLists.txt index ab576e0004a..348e12e303e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive --std=c++17") add_definitions(-D_MT -D_CPPUNWIND -DPURE_DYNAMIC_CAST -DDECLARE_SPECIALIZATION -DM_NOSTDCONTAINERS_EXT -DUSE_OGL) -find_package(Lua51 REQUIRED) +set(LUA_INCLUDE_DIR Externals/luajit/src) +set(LUA_LIBRARIES luajit) +set(LUA_FOUND 1) if (NOT WIN32) find_package(OpenSSL REQUIRED) find_package(Theora REQUIRED) diff --git a/Externals/CMakeLists.txt b/Externals/CMakeLists.txt index 2ad939097e8..617b7f2864a 100644 --- a/Externals/CMakeLists.txt +++ b/Externals/CMakeLists.txt @@ -1,6 +1,5 @@ add_subdirectory(luajit) -include(luabind.cmake) -#add_subdirectory(luabind) +add_subdirectory(luabind) add_subdirectory(lzo) add_subdirectory(cximage) add_subdirectory(NVTT) diff --git a/Externals/luabind.cmake b/Externals/luabind.cmake deleted file mode 100644 index 0ac43b12b1a..00000000000 --- a/Externals/luabind.cmake +++ /dev/null @@ -1,46 +0,0 @@ -cmake_minimum_required(VERSION 2.8) -project(luabind) - -option(LUABIND_BUILD_TESTING "Build luabind testing" OFF) -option(LUABIND_BUILD_SHARED "Build luabind as a shared library?" ON) - -set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_SOURCE_DIR}/cmake") - -if(BUILD_DEPENDS) - add_subdirectory(luajit ${CMAKE_BINARY_DIR}/Externals/luajit) -else() - link_directories(${CMAKE_BINARY_DIR}/Externals/luajit) -endif() -#if(BUILD_DEPENDS) -# add_subdirectory(platform/cmake/LuaJIT ${CMAKE_BINARY_DIR}/LuaJIT) -#else() -# link_directories(dependencies/LuaJIT/build/) -#endif() - -if(MSVC) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP") -endif() - -if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fpermissive") -endif() - -if(LUABIND_BUILD_SHARED) - add_definitions(-DLUABIND_DYNAMIC_LINK) -endif() - -add_definitions(-DNDEBUG) #TODO: Add toggle for debug mode - -include_directories(${CMAKE_CURRENT_SOURCE_DIR} - ${LUA_INCLUDE_DIR} - luabind -) - -add_subdirectory(luabind/src) - -if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) - if(LUABIND_BUILD_TESTING) - add_subdirectory(luabind/test) - endif() - add_subdirectory(luabind/doc) -endif()