X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2FCMakeLists.txt;h=8198773b20b1fb4f667c9f3b45543c7b96235984;hp=0046153b18de497ca036e0807f4df2775b5a6723;hb=df170328230f8dc2731d868b5a0d7074515527bb;hpb=fe4b38e66592f11fdf4c4651863968983daecd2d

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 0046153b..8198773b 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -10,9 +10,11 @@ set(SOURCES
     abstractsqlstorage.cpp
     basichandler.cpp
     core.cpp
+    corealiasmanager.cpp
     corebacklogmanager.cpp
     corebufferviewconfig.cpp
     corebufferviewmanager.cpp
+    corecoreinfo.cpp
     coreirclisthelper.cpp
     corenetwork.cpp
     coresession.cpp
@@ -30,9 +32,11 @@ set(MOC_HDRS
     abstractsqlstorage.h
     basichandler.h
     core.h
+    corealiasmanager.h
     corebacklogmanager.h
     corebufferviewconfig.h
     corebufferviewmanager.h
+    corecoreinfo.h
     coreirclisthelper.h
     corenetwork.h
     coresession.h
@@ -48,15 +52,11 @@ 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})