diff options
author | Ronan Collobert <ronan@collobert.com> | 2014-11-02 06:17:19 +0300 |
---|---|---|
committer | Ronan Collobert <ronan@collobert.com> | 2014-11-02 06:17:19 +0300 |
commit | 9ec05df56920ac35d5875252c34e6d35c02a0a84 (patch) | |
tree | 8a4995a489900d772c02b65ddeca683e048de851 /CMakeLists.txt | |
parent | 974453600c56aac6612396ceb895e87344d679a8 (diff) |
finalize luajit 2.1 support
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 97a7887..b6743d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,8 +9,9 @@ ENDIF(NOT CMAKE_BUILD_TYPE) CMAKE_MINIMUM_REQUIRED(VERSION 2.6 FATAL_ERROR) CMAKE_POLICY(VERSION 2.6) -OPTION(WITH_LUA51 "Use Lua 5.1 instead of LuaJIT" OFF) -OPTION(WITH_LUA52 "Use Lua 5.2 instead of LuaJIT" OFF) +OPTION(WITH_LUA51 "Use Lua 5.1 instead of LuaJIT 2.0" OFF) +OPTION(WITH_LUA52 "Use Lua 5.2 instead of LuaJIT 2.0" OFF) +OPTION(WITH_LUAJIT21 "Use LuaJIT 2.1 instead of LuaJIT 2.0" OFF) IF(WITH_LUA51) SET(LUA_EXE_NAME lua) @@ -20,6 +21,10 @@ ELSEIF(WITH_LUA52) SET(LUA_EXE_NAME lua) SET(LUA_VERSION 5.2) ADD_SUBDIRECTORY(lua-5.2) +ELSEIF(WITH_LUAJIT21) + SET(LUA_EXE_NAME luajit) + SET(LUA_VERSION 5.1) + ADD_SUBDIRECTORY(luajit-2.1) ELSE() SET(LUA_EXE_NAME luajit) SET(LUA_VERSION 5.1) |