projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Big refactoring completed. Everything prepared for the separation of core and gui.
[quassel.git]
/
gui
/
CMakeLists.txt
diff --git
a/gui/CMakeLists.txt
b/gui/CMakeLists.txt
index
f45bf33
..
b622620
100644
(file)
--- a/
gui/CMakeLists.txt
+++ b/
gui/CMakeLists.txt
@@
-1,11
+1,13
@@
-SET(gui_SRCS channelwidget.cpp mainwin.cpp serverlist.cpp)
+SET(gui_SRCS channelwidget.cpp mainwin.cpp serverlist.cpp
guiproxy.cpp
)
SET(gui_HDRS )
SET(gui_HDRS )
-SET(gui_MOCS channelwidget.h mainwin.h serverlist.h)
+SET(gui_MOCS channelwidget.h mainwin.h serverlist.h
guiproxy.h
)
SET(gui_UICS channelwidget.ui identitiesdlg.ui identitieseditdlg.ui networkeditdlg.ui nickeditdlg.ui serverlistdlg.ui)
QT4_WRAP_UI(_UIC ${gui_UICS})
QT4_WRAP_CPP(_MOC ${gui_MOCS})
SET(gui_UICS channelwidget.ui identitiesdlg.ui identitieseditdlg.ui networkeditdlg.ui nickeditdlg.ui serverlistdlg.ui)
QT4_WRAP_UI(_UIC ${gui_UICS})
QT4_WRAP_CPP(_MOC ${gui_MOCS})
-MESSAGE("uic: ${_UIC}")
-MESSAGE("moc: ${_MOC}")
+
+# We need to work around a dependency bug with out-of-source builds...
+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})
ADD_LIBRARY(gui ${gui_HDRS} ${gui_SRCS} ${_MOC} ${_UIC})