X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtgui%2FCMakeLists.txt;h=edd5c455e71e2385fbf581fa0a0f739526c14cce;hb=f8d0e2599bcce55e49f1f92cc7415806e3ff551b;hp=82ad6ff8485348131ce6a8807984885f78316817;hpb=9a39bcb0e71d45140dc7f2390536cf4f7e13e9fe;p=quassel.git diff --git a/src/qtgui/CMakeLists.txt b/src/qtgui/CMakeLists.txt index 82ad6ff8..edd5c455 100644 --- a/src/qtgui/CMakeLists.txt +++ b/src/qtgui/CMakeLists.txt @@ -1,12 +1,12 @@ -SET(qtgui_SRCS chatwidget.cpp chatline.cpp channelwidgetinput.cpp tabcompleter.cpp mainwin.cpp serverlist.cpp bufferwidget.cpp - identities.cpp coreconnectdlg.cpp bufferview.cpp bufferviewwidget.cpp bufferviewfilter.cpp style.cpp settingsdlg.cpp settingspages.cpp) -SET(qtgui_HDRS style.h) -SET(qtgui_MOCS chatwidget.h chatline.h channelwidgetinput.h tabcompleter.h mainwin.h serverlist.h identities.h coreconnectdlg.h - bufferview.h bufferwidget.h bufferviewwidget.h bufferviewfilter.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) + 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}) @@ -16,10 +16,7 @@ ENDFOREACH(ui) QT4_WRAP_UI(_UIC ${qtgui_UICS_UI}) 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}) +#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) -ADD_LIBRARY(qtgui ${qtgui_HDRS} ${qtgui_SRCS} ${_MOC} ${_UIC}) -TARGET_LINK_LIBRARIES(qtgui common) \ No newline at end of file +ADD_LIBRARY(qtgui ${qtgui_SRCS} ${_MOC} ${_UIC}) +TARGET_LINK_LIBRARIES(qtgui common client) \ No newline at end of file