X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2FCMakeLists.txt;h=c5da7506628b15996402ca7f2a53ab1e8456bc53;hp=e2975583f4884edbae039428bfc0b5d1e80927b9;hb=85fb228631cfb087ce80f4b778fae5f1c3877008;hpb=30101791726fb39d5cb1101a8755621fb1780162

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index e2975583..c5da7506 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -1,8 +1,4 @@
 # Builds the common module
-if (QCA2_FOUND)
-    include_directories(${QCA2_INCLUDE_DIR})
-endif (QCA2_FOUND)
-
 set(QT_DONT_USE_QTGUI 1)
 set(QT_USE_QTNETWORK 1)
 include(${QT_USE_FILE})
@@ -16,6 +12,8 @@ set(SOURCES
     bufferviewconfig.cpp
     bufferviewmanager.cpp
     cliparser.cpp
+    event.cpp
+    eventmanager.cpp
     identity.cpp
     ignorelistmanager.cpp
     ircchannel.cpp
@@ -25,24 +23,13 @@ set(SOURCES
     message.cpp
     network.cpp
     networkconfig.cpp
+    networkevent.cpp
     quassel.cpp
     settings.cpp
     signalproxy.cpp
     syncableobject.cpp
     util.cpp)
 
-if (QCA2_FOUND)
-    set(SOURCES ${SOURCES}
-        cipher.cpp)
-endif (QCA2_FOUND)
-
-if(CMAKE_HOST_WIN32)
-    set(SOURCES ${SOURCES} logbacktrace_win.cpp)
-endif(CMAKE_HOST_WIN32)
-if(CMAKE_HOST_UNIX)
-    set(SOURCES ${SOURCES} logbacktrace_unix.cpp)
-endif(CMAKE_HOST_UNIX)
-
 set(MOC_HDRS
     aliasmanager.h
     backlogmanager.h
@@ -51,6 +38,7 @@ set(MOC_HDRS
     bufferviewconfig.h
     bufferviewmanager.h
     coreinfo.h
+    eventmanager.h
     identity.h
     ignorelistmanager.h
     ircchannel.h
@@ -66,21 +54,25 @@ set(HEADERS ${MOC_HDRS}
     abstractcliparser.h
     bufferinfo.h
     cliparser.h
+    event.h
+    networkevent.h
     logger.h
     message.h
     types.h
     util.h)
 
-if (QCA2_FOUND)
-    set(HEADERS ${HEADERS}
-        cipher.h)
-endif (QCA2_FOUND)
-
 if(APPLE)
   set(SOURCES ${SOURCES} mac_utils.cpp)
   set(HEADERS ${HEADERS} mac_utils.h)
 endif(APPLE)
 
+if(CMAKE_HOST_WIN32)
+    set(SOURCES ${SOURCES} logbacktrace_win.cpp)
+endif(CMAKE_HOST_WIN32)
+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_SOURCE_DIR})  # for version.inc and version.gen
@@ -92,10 +84,6 @@ if(APPLE)
   target_link_libraries(mod_common "-framework CoreServices" "-framework CoreFoundation")
 endif(APPLE)
 
-if (QCA2_FOUND)
-  target_link_libraries(mod_common ${QCA2_LIBRARIES})
-endif (QCA2_FOUND)
-
 if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
   find_library(libdl dl)
   if(NOT libdl MATCHES "NOTFOUND")