diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 10d6e179aac9ef994187c961e88f6be390908eac..78094f686fc9f018c3ddcd264fa6d894bd098950 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -32,20 +32,18 @@ lua_source(lua_sources lua/fio.lua) lua_source(lua_sources lua/strict.lua) lua_source(lua_sources ../third_party/luafun/fun.lua) # LuaJIT jit.* library -if (EXISTS "${CMAKE_BINARY_DIR}/third_party/luajit/src/jit/") - lua_source(lua_sources "${CMAKE_BINARY_DIR}/third_party/luajit/src/jit/bc.lua") - lua_source(lua_sources "${CMAKE_BINARY_DIR}/third_party/luajit/src/jit/bcsave.lua") - lua_source(lua_sources "${CMAKE_BINARY_DIR}/third_party/luajit/src/jit/dis_x86.lua") - lua_source(lua_sources "${CMAKE_BINARY_DIR}/third_party/luajit/src/jit/dis_x64.lua") - lua_source(lua_sources "${CMAKE_BINARY_DIR}/third_party/luajit/src/jit/dump.lua") - lua_source(lua_sources "${CMAKE_BINARY_DIR}/third_party/luajit/src/jit/vmdef.lua") - lua_source(lua_sources "${CMAKE_BINARY_DIR}/third_party/luajit/src/jit/v.lua") - if (EXISTS "${PROJECT_BINARY_DIR}/third_party/luajit/src/jit/p.lua") - # Profiler LuaJIT 2.1+ - lua_source(lua_sources "${CMAKE_BINARY_DIR}/third_party/luajit/src/jit/p.lua") - lua_source(lua_sources "${CMAKE_BINARY_DIR}/third_party/luajit/src/jit/zone.lua") - endif() -endif(EXISTS "${CMAKE_BINARY_DIR}/third_party/luajit/src/jit/") +lua_source(lua_sources "${CMAKE_BINARY_DIR}/third_party/luajit/src/jit/bc.lua") +lua_source(lua_sources "${CMAKE_BINARY_DIR}/third_party/luajit/src/jit/bcsave.lua") +lua_source(lua_sources "${CMAKE_BINARY_DIR}/third_party/luajit/src/jit/dis_x86.lua") +lua_source(lua_sources "${CMAKE_BINARY_DIR}/third_party/luajit/src/jit/dis_x64.lua") +lua_source(lua_sources "${CMAKE_BINARY_DIR}/third_party/luajit/src/jit/dump.lua") +lua_source(lua_sources "${CMAKE_BINARY_DIR}/third_party/luajit/src/jit/vmdef.lua") +lua_source(lua_sources "${CMAKE_BINARY_DIR}/third_party/luajit/src/jit/v.lua") +if (EXISTS "${PROJECT_BINARY_DIR}/third_party/luajit/src/jit/p.lua") + # Profiler LuaJIT 2.1+ + lua_source(lua_sources "${CMAKE_BINARY_DIR}/third_party/luajit/src/jit/p.lua") + lua_source(lua_sources "${CMAKE_BINARY_DIR}/third_party/luajit/src/jit/zone.lua") +endif() add_custom_target(generate_lua_sources WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src/box diff --git a/third_party/luajit b/third_party/luajit index 69e5342eb893815b18a1ec84ba74b0e0d1cc9beb..bd34ea57147c74b6f516b0efbe77e96754801507 160000 --- a/third_party/luajit +++ b/third_party/luajit @@ -1 +1 @@ -Subproject commit 69e5342eb893815b18a1ec84ba74b0e0d1cc9beb +Subproject commit bd34ea57147c74b6f516b0efbe77e96754801507