projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Happy New Year!
[quassel.git]
/
src
/
client
/
CMakeLists.txt
diff --git
a/src/client/CMakeLists.txt
b/src/client/CMakeLists.txt
index
53fc761
..
c7b3ee3
100644
(file)
--- a/
src/client/CMakeLists.txt
+++ b/
src/client/CMakeLists.txt
@@
-1,30
+1,40
@@
# Builds the client module
# Builds the client module
-# We still have some minor deps to QtUi: QItemSelectionModel
-# set(QT_DONT_USE_QTGUI 1)
-set(QT_USE_QTNETWORK 1)
-set(QT_USE_QTDBUS 1)
-include(${QT_USE_FILE})
+# In Qt4, we still have some minor deps to QtUi: QItemSelectionModel, QSortFilterProxyModel
+# Still in Qt5: QAbstractItemView in BufferModel
-if (QCA2_FOUND)
- include_directories(${QCA2_INCLUDE_DIR})
-endif (QCA2_FOUND)
+set(_modules )
+
+if(WITH_QT5)
+ list(APPEND _modules Widgets)
+endif(WITH_QT5)
+
+if(HAVE_DBUS)
+ list(APPEND _modules DBus)
+endif(HAVE_DBUS)
+
+setup_qt_variables(Gui Network ${_modules})
set(SOURCES
abstractmessageprocessor.cpp
set(SOURCES
abstractmessageprocessor.cpp
+ abstractui.cpp
backlogrequester.cpp
buffermodel.cpp
buffersettings.cpp
bufferviewoverlay.cpp
client.cpp
clientaliasmanager.cpp
backlogrequester.cpp
buffermodel.cpp
buffersettings.cpp
bufferviewoverlay.cpp
client.cpp
clientaliasmanager.cpp
+ clientauthhandler.cpp
clientbacklogmanager.cpp
clientbufferviewconfig.cpp
clientbufferviewmanager.cpp
clientbacklogmanager.cpp
clientbufferviewconfig.cpp
clientbufferviewmanager.cpp
+ clientcoreinfo.cpp
clientidentity.cpp
clientignorelistmanager.cpp
clientirclisthelper.cpp
clientsettings.cpp
clientidentity.cpp
clientignorelistmanager.cpp
clientirclisthelper.cpp
clientsettings.cpp
+ clienttransfer.cpp
+ clienttransfermanager.cpp
clientuserinputhandler.cpp
coreaccount.cpp
coreaccountmodel.cpp
clientuserinputhandler.cpp
coreaccount.cpp
coreaccountmodel.cpp
@@
-44,6
+54,7
@@
set(MOC_HDRS
bufferviewoverlay.h
client.h
clientaliasmanager.h
bufferviewoverlay.h
client.h
clientaliasmanager.h
+ clientauthhandler.h
clientbacklogmanager.h
clientbufferviewconfig.h
clientbufferviewmanager.h
clientbacklogmanager.h
clientbufferviewconfig.h
clientbufferviewmanager.h
@@
-51,6
+62,8
@@
set(MOC_HDRS
clientidentity.h
clientignorelistmanager.h
clientirclisthelper.h
clientidentity.h
clientignorelistmanager.h
clientirclisthelper.h
+ clienttransfer.h
+ clienttransfermanager.h
clientuserinputhandler.h
coreaccountmodel.h
coreconnection.h
clientuserinputhandler.h
coreaccountmodel.h
coreconnection.h
@@
-70,9
+83,13
@@
set(HEADERS
coreaccount.h
)
coreaccount.h
)
-
qt4_wrap_cpp(MOC ${MOC_HDR
S})
+
include_directories(${CMAKE_SOURCE_DIR}/src/common ${QUASSEL_QT_INCLUDE
S})
-include_directories(${CMAKE_SOURCE_DIR}/src/common)
+if(NOT WITH_QT5)
+ qt4_wrap_cpp(MOC ${MOC_HDRS})
+endif(NOT WITH_QT5)
add_library(mod_client STATIC ${SOURCES} ${MOC} ${HEADERS})
add_dependencies(mod_client mod_common)
add_library(mod_client STATIC ${SOURCES} ${MOC} ${HEADERS})
add_dependencies(mod_client mod_common)
+
+set_target_properties(mod_client PROPERTIES COMPILE_FLAGS "${QUASSEL_QT_COMPILEFLAGS}")