qttorch: is now a rock

2 files changed, 41 insertions, 18 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3e7c93f..f77d4dd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,21 +1,17 @@
-# -*- cmake -*-
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6 FATAL_ERROR)
+CMAKE_POLICY(VERSION 2.6)
 
-IF(Torch_SOURCE_DIR)
+FIND_PACKAGE(Torch REQUIRED)
+FIND_PACKAGE(Qt4 REQUIRED)
 
-  INCLUDE_DIRECTORIES("${Torch_SOURCE_DIR}/lib/TH")
-  INCLUDE_DIRECTORIES("${Torch_SOURCE_DIR}/lib/luaT")
-  INCLUDE_DIRECTORIES("${Torch_BINARY_DIR}/lib/TH")
-  INCLUDE_DIRECTORIES(".")
-  INCLUDE(${QT_USE_FILE})		     
-  
-  SET(qttorch_SRC qttorch.h qttorch.cpp)
-  
-  MACRO_INSTALL_QTLUA_FILES(qttorch init.lua)
-  
-  MACRO_ADD_QTLUA_MODULE(libqttorch ${qttorch_SRC})
-  
-  TARGET_LINK_LIBRARIES(libqttorch luaT TH)
-  
-#  ADD_TORCH_DOK(dok qttorch "QT Interface" "Torch Tensor interface" 6.)
+INCLUDE_DIRECTORIES("${Torch_INSTALL_INCLUDE}/qtlua")
+INCLUDE(${QT_USE_FILE})
 
-ENDIF(Torch_SOURCE_DIR)
+SET(src qttorch.h qttorch.cpp)
+SET(luasrc init.lua)
+
+ADD_TORCH_PACKAGE(qttorch "${src}" "${luasrc}")
+
+TARGET_LINK_LIBRARIES(qttorch luaT TH)
+
+INSTALL(DIRECTORY "doc" DESTINATION "${Torch_INSTALL_LUA_PATH_SUBDIR}/qttorch")
diff --git a/rocks/qttorch-scm-1.rockspec b/rocks/qttorch-scm-1.rockspec
new file mode 100644
index 0000000..5f80251
--- /dev/null
+++ b/rocks/qttorch-scm-1.rockspec
@@ -0,0 +1,27 @@
+package = "qttorch"
+version = "scm-1"
+
+source = {
+   url = "git://github.com/andresy/torch7-split.git",
+   dir = "torch7-split/rocks/qttorch"
+}
+
+description = {
+   summary = "QT interface to Torch",
+   detailed = [[
+   ]],
+   homepage = "https://github.com/torch/qttorch",
+   license = "BSD"
+}
+
+dependencies = {
+   "torch >= 7.0",
+}
+
+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)
+]],
+   install_command = "cd build && $(MAKE) install"
+}