X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=CMakeLists.txt;h=d08682e1a34d06a062682e9e9dcf883919ed4f66;hp=58a6b95bbf55fee421aaa44b0199204d3a52cb36;hb=f02f9f00b4cdb9819fcafbb33c4ee8b044f1f0f1;hpb=04e21ce26ebabdde9586ca9d2a3168431e448df5

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 58a6b95b..d08682e1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,7 @@ 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 "")
@@ -37,8 +37,10 @@ FOREACH(dir ${quassel_DIRS})
   SET(SDIRS ${SDIRS} "${CMAKE_CURRENT_SOURCE_DIR}/${dir}")
 ENDFOREACH(dir)
 INCLUDE_DIRECTORIES(${SDIRS})
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 
 # We need Qt4 support.
+SET(QT_MIN_VERSION "4.2.0")
 FIND_PACKAGE(Qt4 REQUIRED)
 
 # Set needed libraries
@@ -53,11 +55,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})
@@ -65,7 +65,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!
@@ -79,7 +79,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)