X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=gui%2FCMakeLists.txt;h=d651be0c6c2f1a9383f5ff0d4f65d84e07e871d2;hp=1177e9651f59e729706aa759b9ec5b276d6c6642;hb=26586e615ffe42bb2b1b307ed1324a6e3051f5da;hpb=925b072e5c7bc38949995902cf7af6e4644c2c55

diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
index 1177e965..d651be0c 100644
--- a/gui/CMakeLists.txt
+++ b/gui/CMakeLists.txt
@@ -1,9 +1,24 @@
-SET(gui_SRCS channelwidget.cpp mainwin.cpp serverlist.cpp)
-SET(gui_HDRS )
-SET(gui_MOCS channelwidget.h mainwin.h serverlist.h)
-SET(gui_UICS channelwidget.ui identitiesdlg.ui identitieseditdlg.ui networkeditdlg.ui nickeditdlg.ui serverlistdlg.ui)
+SET(gui_SRCS gui.cpp chatwidget.cpp channelwidgetinput.cpp tabcompleter.cpp mainwin.cpp serverlist.cpp buffer.cpp bufferwidget.cpp
+             identities.cpp coreconnectdlg.cpp guiproxy.cpp bufferview.cpp bufferviewwidget.cpp style.cpp settingsdlg.cpp settingspages.cpp)
+SET(gui_HDRS style.h)
+SET(gui_MOCS gui.h chatwidget.h channelwidgetinput.h tabcompleter.h mainwin.h serverlist.h identities.h coreconnectdlg.h
+             guiproxy.h bufferview.h buffer.h bufferwidget.h bufferviewwidget.h settingsdlg.h settingspages.h)
+SET(gui_UICS identitiesdlg.ui identitieseditdlg.ui networkeditdlg.ui mainwin.ui
+             nickeditdlg.ui serverlistdlg.ui servereditdlg.ui coreconnectdlg.ui ircwidget.ui
+             bufferviewwidget.ui bufferwidget.ui settingsdlg.ui
+             buffermgmntsettingspage.ui connectionsettingspage.ui)
 
-QT4_WRAP_UI(_UIC ${gui_UICS})
+# This prepends ui/ to the UIC names, so we don't have to do this ourselves.
+FOREACH(ui ${gui_UICS})
+  SET(gui_UICS_UI ${gui_UICS_UI} "ui/${ui}")
+ENDFOREACH(ui)
+
+QT4_WRAP_UI(_UIC ${gui_UICS_UI})
 QT4_WRAP_CPP(_MOC ${gui_MOCS})
 
-ADD_LIBRARY(gui ${_UIC} ${_MOC} ${gui_HDRS} ${gui_SRCS})
+# 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})
+
+ADD_LIBRARY(gui ${gui_HDRS} ${gui_SRCS} ${_MOC} ${_UIC})