X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2FCMakeLists.txt;h=f1dc2f93cad4b60cdd8550d5fee9e4fccc180abd;hp=710cfbcd083b4d5632162acdf825592792233313;hb=9ad83fb2c64caf43b3f565cc79def6d43d30a5c1;hpb=3f7cb44fffb2beea003892fa2709025d23040c17

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 710cfbcd..f1dc2f93 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -1,10 +1,10 @@
 # Builds the common module
-set(QT_DONT_USE_QTGUI 1)
-set(QT_USE_QTNETWORK 1)
-include(${QT_USE_FILE})
+
+setup_qt_variables(Core Network)
 
 set(SOURCES
     aliasmanager.cpp
+    authhandler.cpp
     backlogmanager.cpp
     basichandler.cpp
     bufferinfo.cpp
@@ -12,11 +12,14 @@ set(SOURCES
     bufferviewconfig.cpp
     bufferviewmanager.cpp
     cliparser.cpp
+    compressor.cpp
+    coreinfo.cpp
     ctcpevent.cpp
     event.cpp
     eventmanager.cpp
     identity.cpp
     ignorelistmanager.cpp
+    internalpeer.cpp
     ircchannel.cpp
     ircevent.cpp
     irclisthelper.cpp
@@ -27,31 +30,52 @@ set(SOURCES
     network.cpp
     networkconfig.cpp
     networkevent.cpp
+    peer.cpp
+    peerfactory.cpp
     quassel.cpp
+    remotepeer.cpp
     settings.cpp
     signalproxy.cpp
     syncableobject.cpp
-    util.cpp)
+    transfer.cpp
+    transfermanager.cpp
+    util.cpp
+
+    protocols/datastream/datastreampeer.cpp
+    protocols/legacy/legacypeer.cpp
+)
 
 set(MOC_HDRS
     aliasmanager.h
+    authhandler.h
     backlogmanager.h
     basichandler.h
     buffersyncer.h
     bufferviewconfig.h
     bufferviewmanager.h
+    compressor.h
     coreinfo.h
     eventmanager.h
     identity.h
     ignorelistmanager.h
+    internalpeer.h
     ircchannel.h
     irclisthelper.h
     ircuser.h
     network.h
     networkconfig.h
+    peer.h
+    peerfactory.h
+    remotepeer.h
     settings.h
     signalproxy.h
-    syncableobject.h)
+    syncableobject.h
+    transfer.h
+    transfermanager.h
+
+    protocols/datastream/datastreampeer.h
+    protocols/legacy/legacypeer.h
+)
 
 set(HEADERS ${MOC_HDRS}
     abstractcliparser.h
@@ -60,13 +84,19 @@ set(HEADERS ${MOC_HDRS}
     ctcpevent.h
     event.h
     ircevent.h
-    networkevent.h
     messageevent.h
+    networkevent.h
     logger.h
     message.h
+    protocol.h
     types.h
     util.h)
 
+if (HAVE_QCA2)
+    set(SOURCES ${SOURCES} keyevent.cpp)
+    set(HEADERS ${HEADERS} keyevent.h)
+endif(HAVE_QCA2)
+
 if(APPLE)
   set(SOURCES ${SOURCES} mac_utils.cpp)
   set(HEADERS ${HEADERS} mac_utils.h)
@@ -79,27 +109,19 @@ if(CMAKE_HOST_UNIX)
     set(SOURCES ${SOURCES} logbacktrace_unix.cpp)
 endif(CMAKE_HOST_UNIX)
 
-qt4_wrap_cpp(MOC ${MOC_HDRS})
+include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QUASSEL_QT_INCLUDES})  # for version.inc and version.gen
+
+if(NOT WITH_QT5)
+  qt4_wrap_cpp(MOC ${MOC_HDRS})
+endif(NOT WITH_QT5)
 
-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR})  # for version.inc and version.gen
 set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES version.gen)
 
-add_library(mod_common STATIC ${SOURCES} ${MOC})
+add_library(mod_common STATIC ${SOURCES} ${HEADERS} ${MOC})
+set_target_properties(mod_common PROPERTIES COMPILE_FLAGS "${QUASSEL_QT_COMPILEFLAGS}")
 
 if(APPLE)
   target_link_libraries(mod_common "-framework CoreServices" "-framework CoreFoundation")
 endif(APPLE)
 
-if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
-  set(FIND_LIBDL TRUE)
-endif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
-if(CMAKE_HOST_SYSTEM_NAME STREQUAL "kFreeBSD")
-  set(FIND_LIBDL TRUE)
-endif(CMAKE_HOST_SYSTEM_NAME STREQUAL "kFreeBSD")
-
-if(FIND_LIBDL)
-  find_library(libdl dl)
-  if(NOT libdl MATCHES "NOTFOUND")
-    target_link_libraries(mod_common ${libdl})
-  endif(NOT libdl MATCHES "NOTFOUND")
-endif(FIND_LIBDL)
+target_link_libraries(mod_common ${CMAKE_DL_LIBS})