Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/torch/luajit-rocks.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSoumith Chintala <soumith@gmail.com>2015-11-17 02:21:36 +0300
committerSoumith Chintala <soumith@gmail.com>2015-11-17 02:21:36 +0300
commit81d43338bc6346936720b69a16fadb837d14e6d2 (patch)
treee7e2441675bebbd20cc3c7116b24f36c40d1d83b
parentfb8461a04f67dfea71c41d02431b38c7d194694e (diff)
parent0252c5d229e7f245e6cbee1e412b917047165151 (diff)
Merge pull request #20 from borisfom/master
Added option to use installed luajit
-rw-r--r--CMakeLists.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ed09c4d..13a55d6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,6 +12,7 @@ CMAKE_POLICY(VERSION 2.6)
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)
+OPTION(WITH_SYSTEM_LUAJIT "Use LuaJIT installed on the system" OFF)
IF(WITH_LUA51)
SET(LUA_EXE_NAME lua)
@@ -29,6 +30,9 @@ ELSEIF(WITH_LUAJIT21)
SET(LUA_EXE_NAME luajit)
SET(LUA_VERSION 5.1)
ADD_SUBDIRECTORY(luajit-2.1)
+ELSEIF(WITH_SYSTEM_LUAJIT)
+ SET(LUA_EXE_NAME luajit)
+ SET(LUA_VERSION 5.1)
ELSE()
SET(LUA_EXE_NAME luajit)
SET(LUA_VERSION 5.1)