X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=CMakeLists.txt;h=f9007b62dfdb19bc95d6ed37daebc3a38aea08de;hp=589e657df09ff8e9389129507bc00dffd4ca35c1;hb=2c9184c37fc54adb7670ea261a8e34c99a82a285;hpb=117a8a4d7ced61a3e374f20c74bea1834386a1d7

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 589e657d..f9007b62 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,27 +24,30 @@ IF(NOT BUILD_MONO AND NOT BUILD_CORE AND NOT BUILD_GUI)
   MESSAGE(FATAL_ERROR "\nYou have not selected which parts of Quassel I should build. Aborting.\nRun 'cmake <path> -DBUILD=<part>', where <part> contains one or more of 'core', 'gui' or 'monolithic', or 'all' to build everything.\n")
 ENDIF(NOT BUILD_MONO AND NOT BUILD_CORE AND NOT BUILD_GUI)
 
+SET(CMAKE_BUILD_TYPE Debug)
+
 # Define files
 SET(quassel_mono_SRCS main/main_mono.cpp)
 SET(quassel_core_SRCS main/main_core.cpp)
 SET(quassel_gui_SRCS  main/main_gui.cpp ${common_SRCS})
 SET(quassel_RCCS images/icons.qrc)
-SET(quassel_DIRS main gui core network)
+SET(quassel_DIRS main gui core)
 
 # Build correct absolute paths for subdirs to include
 SET(SDIRS "")
 FOREACH(dir ${quassel_DIRS})
   SET(SDIRS ${SDIRS} "${CMAKE_CURRENT_SOURCE_DIR}/${dir}")
 ENDFOREACH(dir)
-INCLUDE_DIRECTORIES(${SDIRS})
+INCLUDE_DIRECTORIES(${SDIRS} plugins)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 
 # We need Qt4 support.
-SET(QT_MIN_VERSION "4.2.0")
+SET(QT_MIN_VERSION "4.3.0")
 FIND_PACKAGE(Qt4 REQUIRED)
 
 # Set needed libraries
 SET(QT_USE_QTXML true)
+SET(QT_USE_QTSQL true)
 SET(QT_USE_QTNETWORK true)
 SET(QT_DONT_USE_QTGUI true)   # This is added later if GUI is requested
 INCLUDE(${QT_USE_FILE})
@@ -55,11 +58,9 @@ INCLUDE(${QT_USE_FILE})
 ADD_SUBDIRECTORY(main)
 IF(BUILD_CORE)
   ADD_SUBDIRECTORY(core)
-  ADD_SUBDIRECTORY(network)
 ENDIF(BUILD_CORE)
 IF(BUILD_MONO AND NOT BUILD_CORE)
   ADD_SUBDIRECTORY(core)
-  ADD_SUBDIRECTORY(network)
 ENDIF(BUILD_MONO AND NOT BUILD_CORE)
 
 QT4_ADD_RESOURCES(_RCCS ${quassel_RCCS})
@@ -67,7 +68,7 @@ QT4_ADD_RESOURCES(_RCCS ${quassel_RCCS})
 IF(BUILD_CORE)
   ADD_DEFINITIONS(-DBUILD_CORE)
   ADD_EXECUTABLE(quasselcore ${quassel_core_SRCS} ${_RCCS})
-  TARGET_LINK_LIBRARIES(quasselcore core network main ${QT_LIBRARIES})
+  TARGET_LINK_LIBRARIES(quasselcore core main ${QT_LIBRARIES})
 ENDIF(BUILD_CORE)
 
 IF(BUILD_GUI OR BUILD_MONO)  # OK, now we need QtGui!
@@ -81,7 +82,7 @@ IF(BUILD_GUI OR BUILD_MONO)  # OK, now we need QtGui!
   IF(BUILD_MONO)
     ADD_DEFINITIONS(-DBUILD_MONO)
     ADD_EXECUTABLE(quassel ${quassel_mono_SRCS} ${_RCCS})
-    TARGET_LINK_LIBRARIES(quassel gui core network main ${QT_LIBRARIES})
+    TARGET_LINK_LIBRARIES(quassel gui core main ${QT_LIBRARIES})
   ENDIF(BUILD_MONO)
 
   IF(BUILD_GUI)