3 files changed, 34 insertions, 9 deletions
diff --git a/cmake/Modules/FindGMP.cmake b/cmake/Modules/FindGMP.cmake
index d584eb1e7..64a57cfe0 100644
--- a/cmake/Modules/FindGMP.cmake
+++ b/cmake/Modules/FindGMP.cmake
@@ -1,6 +1,6 @@
 option(ENABLE_SYSTEM_GMP "Use GMP from system" TRUE)
 mark_as_advanced(GMP_LIBRARY GMP_INCLUDE_DIR)
-set(USE_SYSTEM_GMP FALSE PARENT_SCOPE)
+set(USE_SYSTEM_GMP FALSE)
 
 if(ENABLE_SYSTEM_GMP)
 	find_library(GMP_LIBRARY NAMES libgmp.so)
@@ -9,7 +9,6 @@ if(ENABLE_SYSTEM_GMP)
 	if(GMP_LIBRARY AND GMP_INCLUDE_DIR)
 		message (STATUS "Using GMP provided by system.")
 		set(USE_SYSTEM_GMP TRUE)
-		set(USE_SYSTEM_GMP TRUE PARENT_SCOPE)
 	else()
 		message (STATUS "Detecting GMP from system failed.")
 	endif()
@@ -19,11 +18,9 @@ endif()
 
 if(NOT USE_SYSTEM_GMP)
 	message(STATUS "Using bundled mini-gmp library.")
-	set(GMP_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/gmp)
-	set(GMP_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/gmp PARENT_SCOPE)
+	set(GMP_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/gmp)
 	set(GMP_LIBRARY gmp)
-	set(GMP_LIBRARY gmp PARENT_SCOPE)
-	add_subdirectory(gmp)
+	add_subdirectory(lib/gmp)
 endif()
 
 include(FindPackageHandleStandardArgs)
diff --git a/cmake/Modules/FindJson.cmake b/cmake/Modules/FindJson.cmake
index a51a17744..26339a295 100644
--- a/cmake/Modules/FindJson.cmake
+++ b/cmake/Modules/FindJson.cmake
@@ -20,7 +20,7 @@ endif()
 
 if(NOT JSONCPP_FOUND)
 	message(STATUS "Using bundled JSONCPP library.")
-	set(JSON_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/jsoncpp PARENT_SCOPE)
-	set(JSON_LIBRARY jsoncpp PARENT_SCOPE)
-	add_subdirectory(jsoncpp)
+	set(JSON_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/jsoncpp)
+	set(JSON_LIBRARY jsoncpp)
+	add_subdirectory(lib/jsoncpp)
 endif()
diff --git a/cmake/Modules/FindLua.cmake b/cmake/Modules/FindLua.cmake
new file mode 100644
index 000000000..be5d92d8c
--- /dev/null
+++ b/cmake/Modules/FindLua.cmake
@@ -0,0 +1,28 @@
+# Look for Lua library to use
+# This selects LuaJIT by default
+
+option(ENABLE_LUAJIT "Enable LuaJIT support" TRUE)
+set(USE_LUAJIT FALSE)
+option(REQUIRE_LUAJIT "Require LuaJIT support" FALSE)
+if(REQUIRE_LUAJIT)
+	set(ENABLE_LUAJIT TRUE)
+endif()
+if(ENABLE_LUAJIT)
+	find_package(LuaJIT)
+	if(LUAJIT_FOUND)
+		set(USE_LUAJIT TRUE)
+		message (STATUS "Using LuaJIT provided by system.")
+	elseif(REQUIRE_LUAJIT)
+		message(FATAL_ERROR "LuaJIT not found whereas REQUIRE_LUAJIT=\"TRUE\" is used.\n"
+			"To continue, either install LuaJIT or do not use REQUIRE_LUAJIT=\"TRUE\".")
+	endif()
+else()
+	message (STATUS "LuaJIT detection disabled! (ENABLE_LUAJIT=0)")
+endif()
+
+if(NOT USE_LUAJIT)
+	message(STATUS "LuaJIT not found, using bundled Lua.")
+	set(LUA_LIBRARY lua)
+	set(LUA_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/lua/src)
+	add_subdirectory(lib/lua)
+endif()