projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reworking the wordwrap stuff.
[quassel.git]
/
src
/
core
/
CMakeLists.txt
diff --git
a/src/core/CMakeLists.txt
b/src/core/CMakeLists.txt
index
156b84e
..
d73be7c
100644
(file)
--- a/
src/core/CMakeLists.txt
+++ b/
src/core/CMakeLists.txt
@@
-10,9
+10,13
@@
set(SOURCES
abstractsqlstorage.cpp
basichandler.cpp
core.cpp
abstractsqlstorage.cpp
basichandler.cpp
core.cpp
+ corealiasmanager.cpp
corebacklogmanager.cpp
corebufferviewconfig.cpp
corebufferviewmanager.cpp
corebacklogmanager.cpp
corebufferviewconfig.cpp
corebufferviewmanager.cpp
+ corecoreinfo.cpp
+ coreirclisthelper.cpp
+ corenetwork.cpp
coresession.cpp
coresettings.cpp
coreusersettings.cpp
coresession.cpp
coresettings.cpp
coreusersettings.cpp
@@
-24,13
+28,17
@@
set(SOURCES
storage.cpp
userinputhandler.cpp)
storage.cpp
userinputhandler.cpp)
-set(
HEADE
RS
+set(
MOC_HD
RS
abstractsqlstorage.h
basichandler.h
core.h
abstractsqlstorage.h
basichandler.h
core.h
+ corealiasmanager.h
corebacklogmanager.h
corebufferviewconfig.h
corebufferviewmanager.h
corebacklogmanager.h
corebufferviewconfig.h
corebufferviewmanager.h
+ corecoreinfo.h
+ coreirclisthelper.h
+ corenetwork.h
coresession.h
ctcphandler.h
ircserverhandler.h
coresession.h
ctcphandler.h
ircserverhandler.h
@@
-40,19
+48,19
@@
set(HEADERS
sessionthread.h
userinputhandler.h)
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 "-D
QT_NO_OPENSSL")
+if(OPENSSL_FOUND AND NOT
QT_DEFINITIONS MATCHES "
QT_NO_OPENSSL")
set(SOURCES ${SOURCES} sslserver.cpp)
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 ${
HEADE
RS})
+QT4_WRAP_CPP(MOC ${
MOC_HD
RS})
include_directories(${CMAKE_SOURCE_DIR}/src/common)
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)
add_dependencies(mod_core mod_common)