From 430b62322355c0bfe6233586c9823013d60a3335 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Sun, 17 Jul 2016 16:23:29 +0200
Subject: Use system Lua, if available, to generate bindings.

Closes #1031.
---
 src/CMakeLists.txt | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5bf55c81f..075d48968 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -252,6 +252,10 @@ else ()
 		foreach (hdr ${FOLDER_HDRS})
 			list(APPEND SOURCE "${folder}/${hdr}")
 		endforeach(hdr)
+
+		# Include this folder's CMakeLists.txt in the project:
+		list(APPEND SOURCE "${folder}/CMakeLists.txt")
+		source_group("${folder}" FILES "${folder}/CMakeLists.txt")
 	endforeach(folder)
 
 	list(APPEND SOURCE "${SRCS}")
@@ -315,19 +319,26 @@ if (MSVC)
 		list (APPEND BINDINGS_DEPENDENCIES "Bindings/${dep}")
 	endforeach(dep)
 
-	ADD_CUSTOM_COMMAND(
-		OUTPUT ${BINDING_OUTPUTS}
-
-		# Copy the Lua DLL into the Bindings folder, so that tolua can run from there:
-		COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/Server/lua51.dll ./lua51.dll
+	if (HAS_LUA_INTERPRETER)
+		ADD_CUSTOM_COMMAND(
+			OUTPUT ${BINDING_OUTPUTS}
+			COMMAND lua BindingsProcessor.lua
+			WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/
+			DEPENDS ${BINDINGS_DEPENDENCIES}
+		)
+	else()
+		ADD_CUSTOM_COMMAND(
+			OUTPUT ${BINDING_OUTPUTS}
 
-		# Regenerate bindings:
-		COMMAND tolua -L BindingsProcessor.lua -o Bindings.cpp -H Bindings.h AllToLua.pkg
-		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/
+			# Copy the Lua DLL into the Bindings folder, so that tolua can run from there:
+			COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/Server/lua51.dll ./lua51.dll
 
-		# add any new generation dependencies here
-		DEPENDS ${BINDINGS_DEPENDENCIES}
-	)
+			# Regenerate bindings:
+			COMMAND tolua -L BindingsProcessor.lua -o Bindings.cpp -H Bindings.h AllToLua.pkg
+			WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/
+			DEPENDS ${BINDINGS_DEPENDENCIES} tolua
+		)
+	endif()
 endif()
 
 add_executable(${EXECUTABLE} ${SOURCE})
-- 
cgit v1.2.3