From 0960e6ae8ffe329ecd78b2f0f433fcb9e817a696 Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Fri, 18 Jul 2014 19:25:15 -0700
Subject: Moved Windows custom command to src/CMakeLists.txt

---
 src/Bindings/CMakeLists.txt | 16 +---------------
 src/CMakeLists.txt          | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/Bindings/CMakeLists.txt b/src/Bindings/CMakeLists.txt
index 723487ff0..4726eea23 100644
--- a/src/Bindings/CMakeLists.txt
+++ b/src/Bindings/CMakeLists.txt
@@ -112,21 +112,7 @@ set(BINDING_DEPENDECIES
     ../World.h
 )
 
-if (WIN32)
-    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 ../../MCServer/lua51.dll ./lua51.dll
-
-        # Regenerate bindings:
-        COMMAND tolua -L virtual_method_hooks.lua -o Bindings.cpp -H Bindings.h AllToLua.pkg
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-
-        # add any new generation dependencies here
-        DEPENDS ${BINDING_DEPENDECIES}
-    )
-else ()
+if (NOT WIN32)
     ADD_CUSTOM_COMMAND(
         # add any new generated bindings here
         OUTPUT ${BINDING_OUTPUTS}
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6008d3174..168c576e2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -230,6 +230,25 @@ endif()
 
 set(EXECUTABLE MCServer)
 
+if (WIN32)
+	get_directory_property(BINDING_OUTPUTS DIRECTORY "Bindings" DEFINITION BINDING_OUTPUTS)
+	get_directory_property(BINDING_DEPENDENCIES DIRECTORY "Bindings" DEFINITION BINDING_DEPENDENCIES)
+
+	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}/MCServer/lua51.dll ./lua51.dll
+
+		# Regenerate bindings:
+		COMMAND tolua -L Bindings/virtual_method_hooks.lua -o Bindings/Bindings.cpp -H Bindings/Bindings.h Bindings/AllToLua.pkg
+		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+
+		# add any new generation dependencies here
+		DEPENDS ${BINDING_DEPENDECIES}
+	)
+endif()
+
 add_executable(${EXECUTABLE} ${SOURCE})
 
 
-- 
cgit v1.2.3