Revert using luabind.cmake. Use luajit for luabind. Part 2

OpenXRay · May 26, 2018 · b879c43 · b879c43
1 parent 5d7e0dd
commit b879c43
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 49 deletions.
diff --git 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
@@ -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