Merging NetworkConnection into CoreNetwork.

[quassel.git] / src / core / CMakeLists.txt

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 442e105..77525fb 100644 (file)
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -10,15 +10,20 @@ set(SOURCES
     abstractsqlstorage.cpp
     basichandler.cpp
     core.cpp
+    corealiasmanager.cpp
+    coreapplication.cpp
     corebacklogmanager.cpp
     corebufferviewconfig.cpp
     corebufferviewmanager.cpp
+    corecoreinfo.cpp
+    coreircchannel.cpp
+    coreirclisthelper.cpp
+    corenetwork.cpp
     coresession.cpp
     coresettings.cpp
     coreusersettings.cpp
     ctcphandler.cpp
     ircserverhandler.cpp
-    networkconnection.cpp
     sessionthread.cpp
     sqlitestorage.cpp
     storage.cpp
@@ -28,13 +33,18 @@ set(MOC_HDRS
     abstractsqlstorage.h
     basichandler.h
     core.h
+    corealiasmanager.h
+    coreapplication.h
     corebacklogmanager.h
     corebufferviewconfig.h
     corebufferviewmanager.h
+    corecoreinfo.h
+    coreircchannel.h
+    coreirclisthelper.h
+    corenetwork.h
     coresession.h
     ctcphandler.h
     ircserverhandler.h
-    networkconnection.h
     sqlitestorage.h
     storage.h
     sessionthread.h
@@ -44,19 +54,16 @@ set(HEADERS
     coresettings.h
     coreusersettings.h)
 
-# QT_DEFINITIONS actually does not work, stuff gets included always.
-# Funny enough that does not seem to be harmful, but we should still find a way to figure out
-# if we have openssl in Qt...
-find_package(OpenSSL)
-
-if(OPENSSL_FOUND AND NOT ${QT_DEFINITIONS} MATCHES "-DQT_NO_OPENSSL")
+if(HAVE_SSL)
   set(SOURCES ${SOURCES} sslserver.cpp)
   set(MOC_HDRS ${MOC_HDRS} sslserver.h)
-endif(OPENSSL_FOUND AND NOT ${QT_DEFINITIONS} MATCHES "-DQT_NO_OPENSSL")
+  include_directories(${OPENSSL_INCLUDE_DIR})
+endif(HAVE_SSL)
 
-QT4_WRAP_CPP(MOC ${MOC_HDRS})
+qt4_wrap_cpp(MOC ${MOC_HDRS})
+qt4_add_resources(RC_SQL sql.qrc)
 
 include_directories(${CMAKE_SOURCE_DIR}/src/common)
 
-add_library(mod_core STATIC ${SOURCES} ${MOC} ${HEADERS})
+add_library(mod_core STATIC ${SOURCES} ${MOC} ${HEADERS} ${RC_SQL})
 add_dependencies(mod_core mod_common)