From a151d8a541f46d96737cf8d9057d956200d7e6e8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Nov 2011 22:36:13 -0600 Subject: [PATCH] Integrate merged cmake files --- src/CMakeLists.txt | 151 ++++++++++++++++++++++----------------------- 1 file changed, 75 insertions(+), 76 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 104973e..24ab92b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -62,8 +62,6 @@ set( ${target}_SRCS settings/dispcolor_settings.ui settings/display_settings.ui settings/revisiontree_settings.ui settings/subversion_settings.ui settings/cmdexecsettings.ui settings/diffmergesettings.ui - svnfrontend/createrepo_dlg.ui svnfrontend/dumprepo_dlg.ui - svnfrontend/hotcopydlg.ui svnfrontend/loaddmpdlg.ui tdesvnview.cpp commandline_part.cpp ) @@ -77,73 +75,73 @@ tde_add_kpart( ${target} AUTOMOC ##### svnfrontend ############################### tde_add_library( svnfrontend STATIC AUTOMOC - SOURCES ccontextlistener.cpp - commandexec.cpp - copymoveview_impl.cpp - createrepo_impl.cpp - dummydisplay.cpp - dumprepo_impl.cpp - editproperty_impl.cpp - filelistviewitem.cpp - fronthelpers/checkoutinfo_impl.cpp - fronthelpers/checkoutinfo_impl.h - fronthelpers/rangeinput_impl.cpp - fronthelpers/rangeinput_impl.h - fronthelpers/revisionbuttonimpl.cpp - fronthelpers/revisionbuttonimpl.h - fronthelpers/cursorstack.h - fronthelpers/widgetblockstack.cpp - fronthelpers/widgetblockstack.h - fronthelpers/propertylist.cpp - fronthelpers/propertylist.h - fronthelpers/propertyitem.cpp - fronthelpers/propertyitem.h - graphtree/drawparams.cpp - graphtree/drawparams.h - graphtree/elogentry.cpp - graphtree/elogentry.h - graphtree/graphtreelabel.cpp - graphtree/graphtreelabel.h - graphtree/pannerview.cpp - graphtree/pannerview.h - graphtree/revgraphview.cpp - graphtree/revgraphview.h - graphtree/revisiontree.cpp - graphtree/revisiontree.h - graphtree/revtreewidget.cpp - graphtree/revtreewidget.h - hotcopydlg_impl.cpp - importdir_logmsg.cpp - itemdisplay.cpp - tdesvnfilelist.cpp - keystatus.cpp - loaddmpdlg_impl.cpp - mergedlg_impl.cpp - modifiedthread.cpp - opencontextmenu.cpp - propertiesdlg.cpp - stopdlg.cpp - svnactions.cpp - svnfiletip.cpp - svnitem.cpp - svnlogdlgimp.cpp - tcontextlistener.cpp - blamedisplay_impl.cpp - threadcontextlistenerdata.cpp - fillcachethread.cpp - fillcachethread.h - copymoveview.ui - createrepo_dlg.ui - dumprepo_dlg.ui - editpropsdlg.ui - fronthelpers/checkoutinfo.ui - fronthelpers/rangeinput.ui - fronthelpers/revisionbutton.ui - hotcopydlg.ui - loaddmpdlg.ui - merge_dlg.ui - blamedisplay.ui - svnlogdlg.ui + SOURCES svnfrontend/ccontextlistener.cpp + svnfrontend/commandexec.cpp + svnfrontend/copymoveview_impl.cpp + svnfrontend/createrepo_impl.cpp + svnfrontend/dummydisplay.cpp + svnfrontend/dumprepo_impl.cpp + svnfrontend/editproperty_impl.cpp + svnfrontend/filelistviewitem.cpp + svnfrontend/fronthelpers/checkoutinfo_impl.cpp + svnfrontend/fronthelpers/checkoutinfo_impl.h + svnfrontend/fronthelpers/rangeinput_impl.cpp + svnfrontend/fronthelpers/rangeinput_impl.h + svnfrontend/fronthelpers/revisionbuttonimpl.cpp + svnfrontend/fronthelpers/revisionbuttonimpl.h + svnfrontend/fronthelpers/cursorstack.h + svnfrontend/fronthelpers/widgetblockstack.cpp + svnfrontend/fronthelpers/widgetblockstack.h + svnfrontend/fronthelpers/propertylist.cpp + svnfrontend/fronthelpers/propertylist.h + svnfrontend/fronthelpers/propertyitem.cpp + svnfrontend/fronthelpers/propertyitem.h + svnfrontend/graphtree/drawparams.cpp + svnfrontend/graphtree/drawparams.h + svnfrontend/graphtree/elogentry.cpp + svnfrontend/graphtree/elogentry.h + svnfrontend/graphtree/graphtreelabel.cpp + svnfrontend/graphtree/graphtreelabel.h + svnfrontend/graphtree/pannerview.cpp + svnfrontend/graphtree/pannerview.h + svnfrontend/graphtree/revgraphview.cpp + svnfrontend/graphtree/revgraphview.h + svnfrontend/graphtree/revisiontree.cpp + svnfrontend/graphtree/revisiontree.h + svnfrontend/graphtree/revtreewidget.cpp + svnfrontend/graphtree/revtreewidget.h + svnfrontend/hotcopydlg_impl.cpp + svnfrontend/importdir_logmsg.cpp + svnfrontend/itemdisplay.cpp + svnfrontend/tdesvnfilelist.cpp + svnfrontend/keystatus.cpp + svnfrontend/loaddmpdlg_impl.cpp + svnfrontend/mergedlg_impl.cpp + svnfrontend/modifiedthread.cpp + svnfrontend/opencontextmenu.cpp + svnfrontend/propertiesdlg.cpp + svnfrontend/stopdlg.cpp + svnfrontend/svnactions.cpp + svnfrontend/svnfiletip.cpp + svnfrontend/svnitem.cpp + svnfrontend/svnlogdlgimp.cpp + svnfrontend/tcontextlistener.cpp + svnfrontend/blamedisplay_impl.cpp + svnfrontend/threadcontextlistenerdata.cpp + svnfrontend/fillcachethread.cpp + svnfrontend/fillcachethread.h + svnfrontend/copymoveview.ui + svnfrontend/createrepo_dlg.ui + svnfrontend/dumprepo_dlg.ui + svnfrontend/editpropsdlg.ui + svnfrontend/fronthelpers/checkoutinfo.ui + svnfrontend/fronthelpers/rangeinput.ui + svnfrontend/fronthelpers/revisionbutton.ui + svnfrontend/hotcopydlg.ui + svnfrontend/loaddmpdlg.ui + svnfrontend/merge_dlg.ui + svnfrontend/blamedisplay.ui + svnfrontend/svnlogdlg.ui # LINK kio-shared DESTINATION ${LIB_INSTALL_DIR} ) @@ -152,12 +150,13 @@ tde_add_library( svnfrontend STATIC AUTOMOC ##### ksvnwidgets ############################### tde_add_library( ksvnwidgets STATIC AUTOMOC - SOURCES authdialogimpl.cpp logmsg_impl.cpp ssltrustprompt_impl.cpp - pwstorage.cpp diffbrowser.cpp diffbrowserdata.cpp - diffsyntax.cpp encodingselector_impl.cpp depthselector.cpp - revertform_impl.cpp logmessage.ui - ssltrustprompt.ui authdlg.ui encodingselector.ui - depthform.ui revertform.ui + SOURCES ksvnwidgets/authdialogimpl.cpp ksvnwidgets/logmsg_impl.cpp + ksvnwidgets/ssltrustprompt_impl.cpp ksvnwidgets/pwstorage.cpp + ksvnwidgets/diffbrowser.cpp ksvnwidgets/diffbrowserdata.cpp + ksvnwidgets/diffsyntax.cpp ksvnwidgets/encodingselector_impl.cpp + ksvnwidgets/depthselector.cpp ksvnwidgets/revertform_impl.cpp + ksvnwidgets/logmessage.ui ksvnwidgets/ssltrustprompt.ui ksvnwidgets/authdlg.ui + ksvnwidgets/encodingselector.ui ksvnwidgets/depthform.ui ksvnwidgets/revertform.ui # LINK kio-shared DESTINATION ${LIB_INSTALL_DIR} ) @@ -166,7 +165,7 @@ tde_add_library( ksvnwidgets STATIC AUTOMOC ##### kio_ksvn ################################## tde_add_kpart( kio_ksvn AUTOMOC - SOURCES kiosvn.cpp kiolistener.cpp kiobytestream.cpp ../ksvnwidgets/pwstorage.cpp + SOURCES kiosvn/kiosvn.cpp kiosvn/kiolistener.cpp kiosvn/kiobytestream.cpp ksvnwidgets/pwstorage.cpp LINK kio_ksvn svnqt tdesvnhelpers tdesvncfgreader tdecore-shared tdeui-shared DCOP-shared kio-shared kwallet-shared DESTINATION ${PLUGIN_INSTALL_DIR} )