projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CMake tweak so Creator sees the moc'd headers
[quassel.git]
/
src
/
core
/
CMakeLists.txt
diff --git
a/src/core/CMakeLists.txt
b/src/core/CMakeLists.txt
index
e786dab
..
5c6f0b6
100644
(file)
--- a/
src/core/CMakeLists.txt
+++ b/
src/core/CMakeLists.txt
@@
-1,14
+1,6
@@
# Builds the core module
# Builds the core module
-set(QT_DONT_USE_QTGUI 1)
-set(QT_USE_QTNETWORK 1)
-set(QT_USE_QTSQL 1)
-set(QT_USE_QTSCRIPT 1)
-include(${QT_USE_FILE})
-
-if (QCA2_FOUND)
- include_directories(${QCA2_INCLUDE_DIR})
-endif (QCA2_FOUND)
+setup_qt_variables(Network Sql Script)
set(SOURCES
abstractsqlstorage.cpp
set(SOURCES
abstractsqlstorage.cpp
@@
-25,15
+17,19
@@
set(SOURCES
coreignorelistmanager.cpp
coreircchannel.cpp
coreirclisthelper.cpp
coreignorelistmanager.cpp
coreircchannel.cpp
coreirclisthelper.cpp
+ coreircuser.cpp
corenetwork.cpp
corenetworkconfig.cpp
coresession.cpp
corenetwork.cpp
corenetworkconfig.cpp
coresession.cpp
+ coresessioneventprocessor.cpp
coresettings.cpp
coreuserinputhandler.cpp
coreusersettings.cpp
coresettings.cpp
coreuserinputhandler.cpp
coreusersettings.cpp
- ctcphandler.cpp
- ircserverhandler.cpp
+ ctcpparser.cpp
+ eventstringifier.cpp
+ ircparser.cpp
netsplit.cpp
netsplit.cpp
+ oidentdconfiggenerator.cpp
postgresqlstorage.cpp
sessionthread.cpp
sqlitestorage.cpp
postgresqlstorage.cpp
sessionthread.cpp
sqlitestorage.cpp
@@
-54,13
+50,17
@@
set(MOC_HDRS
coreignorelistmanager.h
coreircchannel.h
coreirclisthelper.h
coreignorelistmanager.h
coreircchannel.h
coreirclisthelper.h
+ coreircuser.h
corenetwork.h
corenetworkconfig.h
coresession.h
corenetwork.h
corenetworkconfig.h
coresession.h
+ coresessioneventprocessor.h
coreuserinputhandler.h
coreuserinputhandler.h
- ctcphandler.h
- ircserverhandler.h
+ ctcpparser.h
+ eventstringifier.h
+ ircparser.h
netsplit.h
netsplit.h
+ oidentdconfiggenerator.h
postgresqlstorage.h
sqlitestorage.h
storage.h
postgresqlstorage.h
sqlitestorage.h
storage.h
@@
-76,10
+76,24
@@
if(HAVE_SSL)
include_directories(${OPENSSL_INCLUDE_DIR})
endif(HAVE_SSL)
include_directories(${OPENSSL_INCLUDE_DIR})
endif(HAVE_SSL)
-qt4_wrap_cpp(MOC ${MOC_HDRS})
-set(CORE_RCS ${CORE_RCS} core/sql.qrc PARENT_SCOPE)
+if(HAVE_QCA2)
+ set(SOURCES ${SOURCES} cipher.cpp)
+ set(HEADERS ${HEADERS} cipher.h)
+ include_directories(${QCA2_INCLUDE_DIR})
+endif(HAVE_QCA2)
-include_directories(${CMAKE_SOURCE_DIR}/src/common)
+include_directories(${CMAKE_SOURCE_DIR}/src/common ${QUASSEL_QT_INCLUDES})
+
+if(NOT WITH_QT5)
+ qt4_wrap_cpp(MOC ${MOC_HDRS})
+endif(NOT WITH_QT5)
+
+set(CORE_RCS ${CORE_RCS} core/sql.qrc PARENT_SCOPE)
add_library(mod_core STATIC ${SOURCES} ${MOC} ${HEADERS})
add_dependencies(mod_core mod_common)
add_library(mod_core STATIC ${SOURCES} ${MOC} ${HEADERS})
add_dependencies(mod_core mod_common)
+set_target_properties(mod_core PROPERTIES COMPILE_FLAGS "${QUASSEL_QT_COMPILEFLAGS}")
+
+if(HAVE_QCA2)
+ target_link_libraries(mod_core ${QCA2_LIBRARIES})
+endif(HAVE_QCA2)