Remove explicit linking to OpenSSL in mod_core

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

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 156b84e..1400710 100644 (file)
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -13,6 +13,8 @@ set(SOURCES
     corebacklogmanager.cpp
     corebufferviewconfig.cpp
     corebufferviewmanager.cpp
+    coreirclisthelper.cpp
+    corenetwork.cpp
     coresession.cpp
     coresettings.cpp
     coreusersettings.cpp
@@ -24,13 +26,15 @@ set(SOURCES
     storage.cpp
     userinputhandler.cpp)
 
-set(HEADERS
+set(MOC_HDRS
     abstractsqlstorage.h
     basichandler.h
     core.h
     corebacklogmanager.h
     corebufferviewconfig.h
     corebufferviewmanager.h
+    coreirclisthelper.h
+    corenetwork.h
     coresession.h
     ctcphandler.h
     ircserverhandler.h
@@ -40,19 +44,22 @@ set(HEADERS
     sessionthread.h
     userinputhandler.h)
 
+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(OPENSSL_FOUND AND NOT QT_DEFINITIONS MATCHES "-DQT_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 "-DQT_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)