projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleaned up the gui/ directory by moving all *.ui files in a subdirectory.
[quassel.git]
/
gui
/
CMakeLists.txt
diff --git
a/gui/CMakeLists.txt
b/gui/CMakeLists.txt
index
d83476c
..
4d6297e
100644
(file)
--- a/
gui/CMakeLists.txt
+++ b/
gui/CMakeLists.txt
@@
-1,10
+1,16
@@
-SET(gui_SRCS channelwidget.cpp mainwin.cpp serverlist.cpp identities.cpp coreconnectdlg.cpp guiproxy.cpp)
+SET(gui_SRCS channelwidget.cpp channelwidgetinput.cpp mainwin.cpp serverlist.cpp
+ identities.cpp coreconnectdlg.cpp guiproxy.cpp)
SET(gui_HDRS )
SET(gui_HDRS )
-SET(gui_MOCS channelwidget.h mainwin.h serverlist.h identities.h coreconnectdlg.h guiproxy.h)
-SET(gui_UICS channelwidget.ui identitiesdlg.ui identitieseditdlg.ui networkeditdlg.ui
+SET(gui_MOCS channelwidget.h
channelwidgetinput.h
mainwin.h serverlist.h identities.h coreconnectdlg.h guiproxy.h)
+SET(gui_UICS channelwidget.ui 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 ircwidget.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})
# We need to work around a dependency bug with out-of-source builds...
QT4_WRAP_CPP(_MOC ${gui_MOCS})
# We need to work around a dependency bug with out-of-source builds...