1 files changed, 31 insertions, 61 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5a1256d..0a587c8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,62 +7,39 @@ CMAKE_POLICY(VERSION 2.6)
 
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
-# If you want to include Lua in a main project,
-# you might want to define those variables yourself
-IF(NOT QtLua_IS_SUBPROJECT)
-  INCLUDE(QtLuaPaths)
-
-  # We do not support dok generation for now
-  MACRO(ADD_TORCH_DOK)
-  ENDMACRO(ADD_TORCH_DOK)
-ENDIF()
+INCLUDE(QtLuaPaths)
 
 # --- General
 
-SET(WITH_QTLUA ON 
-  CACHE BOOL "Compile qlua and associated packages")
-
 SET(WITH_QTLUA_IDE ON
   CACHE BOOL "Compile qlua ide (require Qt>=4.4)")
 
 # --- Macros
 
-IF (WITH_QTLUA)
-  INCLUDE(MacroQt4AutoGen)
-  INCLUDE(MacroAddQtLuaModule)
-  INCLUDE(CheckCXXSourceCompiles)
-  INCLUDE(CheckCXXSourceRuns)
-ENDIF (WITH_QTLUA)
-
+INCLUDE(MacroQt4AutoGen)
+INCLUDE(MacroAddQtLuaModule)
+INCLUDE(CheckCXXSourceCompiles)
+INCLUDE(CheckCXXSourceRuns)
 
 # --- Qt4
 
-IF (WITH_QTLUA AND NOT QT4_FOUND)
-  SET(QT_MIN_VERSION "4.3.0")
-  FIND_PACKAGE(Qt4)
-  IF (NOT QT4_FOUND)
-    MESSAGE(STATUS "Disabling QtLua (No suitable Qt4)")
-    SET(WITH_QTLUA FALSE CACHE BOOL "Compile qlua and associated packages" FORCE)
-  ENDIF (NOT QT4_FOUND)
-ENDIF (WITH_QTLUA AND NOT QT4_FOUND)
-
+SET(QT_MIN_VERSION "4.3.0")
+FIND_PACKAGE(Qt4 REQUIRED)
 
 # --- Lua
 
-# find lua
-IF (WITH_QTLUA)
-  INCLUDE_DIRECTORIES(${LUA_INCLUDE_DIR})
-ENDIF(WITH_QTLUA)
+# Include Lua Files
+FIND_PACKAGE(Lua REQUIRED)
+INCLUDE_DIRECTORIES(${LUA_INCDIR})
 
-# It is not easy to check this because we have the relative
-# paths activated in general... so the program fails
-# to execute given it is not at the install place
+## Hard to check because of issues with RPATH
+## The compiled program looks for the lua library
+## relative to its own location (arg!)
 # # was lua compiled with c++?
-# IF (WITH_QTLUA AND NOT LUA_COMPILED_WITH_CXX)
-#   SET(CMAKE_REQUIRED_DEFINITIONS ${LUA_DEFINITIONS})
-#   SET(CMAKE_REQUIRED_INCLUDES ${LUA_INCLUDE_DIR})
-#   SET(CMAKE_REQUIRED_LIBRARIES ${LUA_LIBRARIES})
-#   CHECK_CXX_SOURCE_RUNS("
+# SET(CMAKE_REQUIRED_DEFINITIONS ${LUA_DEFINITIONS})
+# SET(CMAKE_REQUIRED_INCLUDES ${LUA_INCLUDE_DIR})
+# SET(CMAKE_REQUIRED_LIBRARIES ${LUA_LIBRARIES})
+# CHECK_CXX_SOURCE_RUNS("
 # #include <stdlib.h>
 # #include \"lua.h\"
 # #include \"lauxlib.h\"
@@ -74,29 +51,22 @@ ENDIF(WITH_QTLUA)
 #   lua_pushcfunction(L, foo);
 #   lua_pcall(L, 0, 0, 0); exit(result); }" 
 #   LUA_COMPILED_WITH_CXX)
-#   SET(CMAKE_REQUIRED_DEFINITIONS)
-#   SET(CMAKE_REQUIRED_INCLUDES)
-#   SET(CMAKE_REQUIRED_LIBRARIES)
-#   MESSAGE("HEYYY <${LUA_COMPILED_WITH_CXX}>")
-#   IF (NOT "${LUA_COMPILED_WITH_CXX}" EQUAL "0")
-#     MESSAGE(STATUS "Disabling QtLua (Lua not compiled with C++ exceptions support)")
-#     SET(WITH_QTLUA FALSE)
-#   ENDIF (NOT "${LUA_COMPILED_WITH_CXX}" EQUAL "0")
-# ENDIF(WITH_QTLUA AND NOT LUA_COMPILED_WITH_CXX)
+# SET(CMAKE_REQUIRED_DEFINITIONS)
+# SET(CMAKE_REQUIRED_INCLUDES)
+# SET(CMAKE_REQUIRED_LIBRARIES)
+# MESSAGE("HEYYY <${LUA_COMPILED_WITH_CXX}>")
+# IF (NOT "${LUA_COMPILED_WITH_CXX}" EQUAL "0")
+#   MESSAGE(FATAL_ERROR "Lua not compiled with C++ exceptions support")
+# ENDIF (NOT "${LUA_COMPILED_WITH_CXX}" EQUAL "0")
 
 
 # --- compile libqtlua
 
-
-IF (WITH_QTLUA)
-  # ADD_SUBDIRECTORY(qtutil)
-  ADD_SUBDIRECTORY(qtlua)
-  FIND_PACKAGE(QtLua REQUIRED)
-  ADD_SUBDIRECTORY(qlua)
-  ADD_SUBDIRECTORY(packages)
-ENDIF (WITH_QTLUA)
-
-
+# ADD_SUBDIRECTORY(qtutil)
+ADD_SUBDIRECTORY(qtlua)
+FIND_PACKAGE(QtLua REQUIRED)
+ADD_SUBDIRECTORY(qlua)
+ADD_SUBDIRECTORY(packages)
 
 # --- install qt libraries
 
@@ -105,7 +75,7 @@ IF (WIN32 AND NOT CYGWIN)
     CACHE BOOL "Copy the required Qt DLLs into the Torch install dirs")
 ENDIF (WIN32 AND NOT CYGWIN)
 
-IF (WITH_QTLUA AND QT_INSTALL_LIBRARIES)
+IF (QT_INSTALL_LIBRARIES)
   # -- turn on all the qt modules we use
   SET(QT_USE_QTUITOOLS 1)
   SET(QT_USE_QTWEBKIT 1)
@@ -114,4 +84,4 @@ IF (WITH_QTLUA AND QT_INSTALL_LIBRARIES)
   SET(QT_USE_QTSVG 1)
   # -- this takes care of the install
   INCLUDE("InstallRequiredQtLibraries")
-ENDIF (WITH_QTLUA AND QT_INSTALL_LIBRARIES)
+ENDIF (QT_INSTALL_LIBRARIES)