From 8c981b76cc73f86918a93b2e4618c36b2edfecc9 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sat, 28 Dec 2013 15:13:22 -0800
Subject: [PATCH] cmake: fix path to tolua executable.

---
 CMakeLists.txt                   | 6 +++---
 cmake                            | 2 +-
 core/src/bindings/CMakeLists.txt | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4861dd3ee..49a932721 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,11 +21,11 @@ ELSE(CMAKE_COMPILER_IS_GNUCC)
     MESSAGE(STATUS "Unknown compiler ${CMAKE_C_COMPILER_ID}")
 ENDIF(CMAKE_COMPILER_IS_GNUCC)
 
-find_package (Lua 5 REQUIRED)
-find_package (ToLua REQUIRED)
 find_package (LibXml2 REQUIRED)
-find_package (Curses REQUIRED)
 find_package (SQLite3 REQUIRED)
+find_package (Curses REQUIRED)
+find_package (Lua REQUIRED)
+find_package (ToLua REQUIRED)
 
 add_subdirectory (src server)
 add_subdirectory (crypto)
diff --git a/cmake b/cmake
index 92b721b05..31a008381 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 92b721b05086d95d7d87112d740f3bd80d9dc9e6
+Subproject commit 31a00838133b93d4954517441898dceec527e303
diff --git a/core/src/bindings/CMakeLists.txt b/core/src/bindings/CMakeLists.txt
index 734c0cf71..9a080fd95 100755
--- a/core/src/bindings/CMakeLists.txt
+++ b/core/src/bindings/CMakeLists.txt
@@ -3,6 +3,7 @@ project (bindings C)
 
 IF(CMAKE_COMPILER_IS_GNUCC)
     SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -pedantic -Wall -Werror -Wno-unknown-pragmas -Wstrict-prototypes -Wpointer-arith -Wno-char-subscripts -Wno-long-long")
+ELSEIF(MSVC)
 ELSE(CMAKE_COMPILER_IS_GNUCC)
     MESSAGE(STATUS "Unknown compiler ${CMAKE_C_COMPILER_ID}")
 ENDIF(CMAKE_COMPILER_IS_GNUCC)
@@ -36,7 +37,7 @@ MACRO(TOLUA_BINDING PKGFILE FILES)
   ADD_CUSTOM_COMMAND(
     OUTPUT ${PKGFILE}.c
     DEPENDS ${FILES} ${PKGFILE}
-    COMMAND tolua
+    COMMAND ${TOLUA_EXECUTABLE}
     ARGS -o ${CMAKE_CURRENT_BINARY_DIR}/${PKGFILE}.c ${PKGFILE}
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
   )