From 83f7c8140c15fee662bd7824c34a256a2d93ae88 Mon Sep 17 00:00:00 2001
From: samehkhamis <sameh.khamis@gmail.com>
Date: Thu, 30 Jul 2015 14:23:49 -0700
Subject: Compiling under Windows

---
 CMakeLists.txt               | 6 +++++-
 rocks/qttorch-scm-1.rockspec | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f77d4dd..2e963cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,7 @@ FIND_PACKAGE(Torch REQUIRED)
 FIND_PACKAGE(Qt4 REQUIRED)
 
 INCLUDE_DIRECTORIES("${Torch_INSTALL_INCLUDE}/qtlua")
+LINK_DIRECTORIES(${LUA_LIBDIR})
 INCLUDE(${QT_USE_FILE})
 
 SET(src qttorch.h qttorch.cpp)
@@ -12,6 +13,9 @@ SET(luasrc init.lua)
 
 ADD_TORCH_PACKAGE(qttorch "${src}" "${luasrc}")
 
-TARGET_LINK_LIBRARIES(qttorch luaT TH)
+TARGET_LINK_LIBRARIES(qttorch luaT TH qtlua ${QT_LIBRARIES})
+IF(LUALIB)
+  TARGET_LINK_LIBRARIES(qttorch ${LUALIB})
+ENDIF()
 
 INSTALL(DIRECTORY "doc" DESTINATION "${Torch_INSTALL_LUA_PATH_SUBDIR}/qttorch")
diff --git a/rocks/qttorch-scm-1.rockspec b/rocks/qttorch-scm-1.rockspec
index 11b98dd..1de1bb3 100644
--- a/rocks/qttorch-scm-1.rockspec
+++ b/rocks/qttorch-scm-1.rockspec
@@ -21,7 +21,7 @@ dependencies = {
 build = {
    type = "command",
    build_command = [[
-cmake -E make_directory build && cd build && cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$(LUA_BINDIR)/.." -DCMAKE_INSTALL_PREFIX="$(PREFIX)" && $(MAKE)
+cmake -E make_directory build && cd build && cmake .. -DLUALIB=$(LUALIB) -DLUA_LIBDIR="$(LUA_LIBDIR)" -DLUADIR="$(LUADIR)" -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$(LUA_BINDIR)/.." -DCMAKE_INSTALL_PREFIX="$(PREFIX)" && $(MAKE)
 ]],
    install_command = "cd build && $(MAKE) install"
 }
-- 
cgit v1.2.3