X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2FCMakeLists.txt;h=4491f568b4da0d277bfa1256272c01f65bbfe07f;hp=37110f3ec9c9d09999b7ad95248736cb07bcd94f;hb=9ba9f4c7b0122803fe0d73a8556b1506e77d32a4;hpb=be8488a1fe20fd121d9c54dc52b24966a3432740

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 37110f3e..4491f568 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -10,9 +10,15 @@ 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
@@ -28,9 +34,15 @@ 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
@@ -44,19 +56,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...
-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)
-  link_libraries(${OPENSSL_LIBRARIES})
   include_directories(${OPENSSL_INCLUDE_DIR})
-endif(OPENSSL_FOUND AND NOT QT_DEFINITIONS MATCHES "-DQT_NO_OPENSSL")
+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)