progressing

Author: Kaiyu Yang

CMakeLists.txt

@@ -16,18 +16,14 @@ FIND_PACKAGE(OpenCV REQUIRED)
 # Once more (silently) to look for the installed modules
 FIND_PACKAGE(OpenCV OPTIONAL_COMPONENTS ${OPENCV_MODULES_TO_WRAP})
 
-IF(LUAROCKS_PREFIX)
-    MESSAGE(STATUS "Installing Torch through Luarocks")
-    STRING(REGEX REPLACE "(.*)lib/luarocks/rocks.*" "\\1" CMAKE_INSTALL_PREFIX  "${LUAROCKS_PREFIX}")
-    MESSAGE(STATUS "Prefix inferred from Luarocks: ${CMAKE_INSTALL_PREFIX}")
-ENDIF()
-
 FIND_PACKAGE(Torch REQUIRED)
 INCLUDE_DIRECTORIES(${Torch_INSTALL_INCLUDE} ${OpenCV_INCLUDE_DIRS})
 
-FILE(GLOB luasrc *.lua)
+FILE(GLOB luasrc *.lua cv/*.lua)
+SET(luasrc ${luasrc})
+FILE(GLOB sharedlib lib/*)
 SET(luasrc ${luasrc})
-ADD_TORCH_PACKAGE(torch-opencv "" "${luasrc}" "torch-opencv")
+ADD_TORCH_PACKAGE(cv "" "${luasrc}" "cv")
 
 SET(SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src")
 INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/include")
@@ -39,13 +35,16 @@ ADD_LIBRARY(Classes SHARED "${SOURCE_DIR}/Classes.cpp")
 TARGET_LINK_LIBRARIES(Classes Common)
 
 FOREACH(MODULE ${OPENCV_MODULES_TO_WRAP})
+    ADD_SUBDIRECTORY(cv/${MODULE})
     STRING(TOUPPER ${MODULE} MODULE_UPPERCASE)
     IF (OPENCV_${MODULE_UPPERCASE}_FOUND)
         ADD_LIBRARY(${MODULE} SHARED "${SOURCE_DIR}/${MODULE}.cpp")
         TARGET_LINK_LIBRARIES(${MODULE} Common)
     ENDIF()
 ENDFOREACH()
 
+INSTALL(DIRECTORY "lib" DESTINATION "${Torch_INSTALL_LUA_PATH_SUBDIR}/cv")
+
 IF (BUILD_TESTS)
     FILE(GLOB Tests_SRC "${SOURCE_DIR}/tests/*.cpp")
     ADD_LIBRARY(Tests SHARED ${Tests_SRC})

cv/_env.lua renamed to _env.lua

@@ -1,4 +1,4 @@
-package = "torch-opencv"
+package = "cv"
 version = "scm-1"
 
 source = {

torch-opencv-scm-1.rockspec renamed to cv-scm-1.rockspec

@@ -0,0 +1,5 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6 FATAL_ERROR)
+CMAKE_POLICY(VERSION 2.6)
+SET(src)
+FILE(GLOB luasrc *.lua)
+ADD_TORCH_PACKAGE(cv/features2d "${src}" "${luasrc}")

cv.lua

@@ -0,0 +1,5 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6 FATAL_ERROR)
+CMAKE_POLICY(VERSION 2.6)
+SET(src)
+FILE(GLOB luasrc *.lua)
+ADD_TORCH_PACKAGE(cv/flann "${src}" "${luasrc}")

cv/features2d/CMakeLists.txt

@@ -0,0 +1,5 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6 FATAL_ERROR)
+CMAKE_POLICY(VERSION 2.6)
+SET(src)
+FILE(GLOB luasrc *.lua)
+ADD_TORCH_PACKAGE(cv/highgui "${src}" "${luasrc}")

cv/flann/CMakeLists.txt

@@ -0,0 +1,5 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6 FATAL_ERROR)
+CMAKE_POLICY(VERSION 2.6)
+SET(src)
+FILE(GLOB luasrc *.lua)
+ADD_TORCH_PACKAGE(cv/imgcodecs "${src}" "${luasrc}")

cv/highgui/CMakeLists.txt

@@ -0,0 +1,5 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6 FATAL_ERROR)
+CMAKE_POLICY(VERSION 2.6)
+SET(src)
+FILE(GLOB luasrc *.lua)
+ADD_TORCH_PACKAGE(cv/imgproc "${src}" "${luasrc}")

cv/imgcodecs/CMakeLists.txt

@@ -0,0 +1,5 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6 FATAL_ERROR)
+CMAKE_POLICY(VERSION 2.6)
+SET(src)
+FILE(GLOB luasrc *.lua)
+ADD_TORCH_PACKAGE(cv/optflow "${src}" "${luasrc}")

cv/imgproc/CMakeLists.txt

@@ -0,0 +1,5 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6 FATAL_ERROR)
+CMAKE_POLICY(VERSION 2.6)
+SET(src)
+FILE(GLOB luasrc *.lua)
+ADD_TORCH_PACKAGE(cv/imgcodecs "${src}" "${luasrc}")

cv/ml/CMakeLists.txt

@@ -0,0 +1,5 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6 FATAL_ERROR)
+CMAKE_POLICY(VERSION 2.6)
+SET(src)
+FILE(GLOB luasrc *.lua)
+ADD_TORCH_PACKAGE(cv/photo "${src}" "${luasrc}")

cv/optflow/CMakeLists.txt

@@ -0,0 +1,5 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6 FATAL_ERROR)
+CMAKE_POLICY(VERSION 2.6)
+SET(src)
+FILE(GLOB luasrc *.lua)
+ADD_TORCH_PACKAGE(cv/video "${src}" "${luasrc}")

cv/photo/CMakeLists.txt

@@ -0,0 +1,5 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6 FATAL_ERROR)
+CMAKE_POLICY(VERSION 2.6)
+SET(src)
+FILE(GLOB luasrc *.lua)
+ADD_TORCH_PACKAGE(cv/imgcodecs "${src}" "${luasrc}")

cv/superres/CMakeLists.txt

@@ -0,0 +1,5 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6 FATAL_ERROR)
+CMAKE_POLICY(VERSION 2.6)
+SET(src)
+FILE(GLOB luasrc *.lua)
+ADD_TORCH_PACKAGE(cv/videoio "${src}" "${luasrc}")