X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2FCMakeLists.txt;h=d73be7c206ad9c43e4a7fdd6d9a9f4b6140807a7;hb=6bf23e48f2591fc189fdefbf31f5a224169e61f4;hp=156b84e49745c1860a241cb227ef32ab32d554cb;hpb=0ef2797c935b8cba29b667da150c8ab9117b0647;p=quassel.git

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 156b84e4..d73be7c2 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -10,9 +10,13 @@ set(SOURCES
     abstractsqlstorage.cpp
     basichandler.cpp
     core.cpp
+    corealiasmanager.cpp
     corebacklogmanager.cpp
     corebufferviewconfig.cpp
     corebufferviewmanager.cpp
+    corecoreinfo.cpp
+    coreirclisthelper.cpp
+    corenetwork.cpp
     coresession.cpp
     coresettings.cpp
     coreusersettings.cpp
@@ -24,13 +28,17 @@ set(SOURCES
     storage.cpp
     userinputhandler.cpp)
 
-set(HEADERS
+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
     ctcphandler.h
     ircserverhandler.h
@@ -40,19 +48,19 @@ set(HEADERS
     sessionthread.h
     userinputhandler.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)
+set(HEADERS
+    coresettings.h
+    coreusersettings.h)
 
-if(OPENSSL_FOUND AND NOT ${QT_DEFINITIONS} MATCHES "-DQT_NO_OPENSSL")
+if(OPENSSL_FOUND AND NOT QT_DEFINITIONS MATCHES "QT_NO_OPENSSL")
   set(SOURCES ${SOURCES} sslserver.cpp)
-  set(HEADERS ${HEADERS} sslserver.h)
-endif(OPENSSL_FOUND AND NOT ${QT_DEFINITIONS} MATCHES "-DQT_NO_OPENSSL")
+  set(MOC_HDRS ${MOC_HDRS} sslserver.h)
+  include_directories(${OPENSSL_INCLUDE_DIR})
+endif(OPENSSL_FOUND AND NOT QT_DEFINITIONS MATCHES "QT_NO_OPENSSL")
 
-QT4_WRAP_CPP(MOC ${HEADERS})
+QT4_WRAP_CPP(MOC ${MOC_HDRS})
 
 include_directories(${CMAKE_SOURCE_DIR}/src/common)
 
-add_library(mod_core STATIC ${SOURCES} ${MOC})
+add_library(mod_core STATIC ${SOURCES} ${MOC} ${HEADERS})
 add_dependencies(mod_core mod_common)