X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fqtgui%2FCMakeLists.txt;h=edd5c455e71e2385fbf581fa0a0f739526c14cce;hb=64773d0bbb9ad9e7b0a26aa9751447fa7288ca56;hp=367efa451525bd26d77adfa83320066b9c0be5e0;hpb=15ee1478137bc748e27b0b06537973d8df04b9d7;p=quassel.git

diff --git a/src/qtgui/CMakeLists.txt b/src/qtgui/CMakeLists.txt
index 367efa45..edd5c455 100644
--- a/src/qtgui/CMakeLists.txt
+++ b/src/qtgui/CMakeLists.txt
@@ -1,15 +1,12 @@
-SET(qtgui_SRCS chatwidget.cpp channelwidgetinput.cpp tabcompleter.cpp mainwin.cpp serverlist.cpp bufferwidget.cpp
-             identities.cpp coreconnectdlg.cpp bufferview.cpp bufferviewwidget.cpp style.cpp settingsdlg.cpp settingspages.cpp)
-SET(qtgui_HDRS style.h)
-SET(qtgui_MOCS chatwidget.h channelwidgetinput.h tabcompleter.h mainwin.h serverlist.h identities.h coreconnectdlg.h
-             bufferview.h bufferwidget.h bufferviewwidget.h settingsdlg.h settingspages.h)
+SET(qtgui_SRCS bufferview.cpp bufferviewfilter.cpp bufferwidget.cpp channelwidgetinput.cpp chatline.cpp chatwidget.cpp coreconnectdlg.cpp
+             guisettings.cpp identities.cpp mainwin.cpp qtgui.cpp serverlist.cpp settingsdlg.cpp style.cpp tabcompleter.cpp)
+SET(qtgui_HDRS style.h settingspage.h)
+SET(qtgui_MOCS bufferview.h bufferviewfilter.h bufferwidget.h channelwidgetinput.h chatline.h chatwidget.h coreconnectdlg.h
+              guisettings.h identities.h mainwin.h qtgui.h serverlist.h settingsdlg.h tabcompleter.h)
 SET(qtgui_UICS identitiesdlg.ui identitieseditdlg.ui networkeditdlg.ui mainwin.ui
-             nickeditdlg.ui serverlistdlg.ui servereditdlg.ui coreconnectdlg.ui ircwidget.ui
+             nickeditdlg.ui serverlistdlg.ui servereditdlg.ui coreconnectdlg.ui
              bufferviewwidget.ui bufferwidget.ui settingsdlg.ui
-             buffermgmntsettingspage.ui connectionsettingspage.ui)
-
-SET(client_SRCS ../client/client.cpp ../client/clientproxy.cpp ../client/buffer.cpp)
-SET(client_MOCS ../client/client.h ../client/clientproxy.h ../client/buffer.h)
+             buffermgmtpage.ui connectionpage.ui usermgmtpage.ui)
 
 # This prepends ui/ to the UIC names, so we don't have to do this ourselves.
 FOREACH(ui ${qtgui_UICS})
@@ -17,11 +14,9 @@ FOREACH(ui ${qtgui_UICS})
 ENDFOREACH(ui)
 
 QT4_WRAP_UI(_UIC ${qtgui_UICS_UI})
-QT4_WRAP_CPP(_MOC ${qtgui_MOCS} ${client_MOCS})
+QT4_WRAP_CPP(_MOC ${qtgui_MOCS})
 
-# We need to work around a dependency bug with out-of-source builds...
-# Seems to be fixed!
-#SET_SOURCE_FILES_PROPERTIES(${gui_SRCS} PROPERTIES OBJECT_DEPENDS "${_UIC}")
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} client)
+#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 
-ADD_LIBRARY(qtgui ${qtgui_HDRS} ${qtgui_SRCS} ${client_SRCS} ${_MOC} ${_UIC})
+ADD_LIBRARY(qtgui ${qtgui_SRCS} ${_MOC} ${_UIC})
+TARGET_LINK_LIBRARIES(qtgui common client)
\ No newline at end of file