Integrate merged cmake files

pull/1/head
Timothy Pearson 13 years ago
parent b6c108cbf3
commit a151d8a541

@ -62,8 +62,6 @@ set( ${target}_SRCS
settings/dispcolor_settings.ui settings/display_settings.ui settings/revisiontree_settings.ui settings/dispcolor_settings.ui settings/display_settings.ui settings/revisiontree_settings.ui
settings/subversion_settings.ui settings/cmdexecsettings.ui settings/subversion_settings.ui settings/cmdexecsettings.ui
settings/diffmergesettings.ui settings/diffmergesettings.ui
svnfrontend/createrepo_dlg.ui svnfrontend/dumprepo_dlg.ui
svnfrontend/hotcopydlg.ui svnfrontend/loaddmpdlg.ui
tdesvnview.cpp commandline_part.cpp tdesvnview.cpp commandline_part.cpp
) )
@ -77,73 +75,73 @@ tde_add_kpart( ${target} AUTOMOC
##### svnfrontend ############################### ##### svnfrontend ###############################
tde_add_library( svnfrontend STATIC AUTOMOC tde_add_library( svnfrontend STATIC AUTOMOC
SOURCES ccontextlistener.cpp SOURCES svnfrontend/ccontextlistener.cpp
commandexec.cpp svnfrontend/commandexec.cpp
copymoveview_impl.cpp svnfrontend/copymoveview_impl.cpp
createrepo_impl.cpp svnfrontend/createrepo_impl.cpp
dummydisplay.cpp svnfrontend/dummydisplay.cpp
dumprepo_impl.cpp svnfrontend/dumprepo_impl.cpp
editproperty_impl.cpp svnfrontend/editproperty_impl.cpp
filelistviewitem.cpp svnfrontend/filelistviewitem.cpp
fronthelpers/checkoutinfo_impl.cpp svnfrontend/fronthelpers/checkoutinfo_impl.cpp
fronthelpers/checkoutinfo_impl.h svnfrontend/fronthelpers/checkoutinfo_impl.h
fronthelpers/rangeinput_impl.cpp svnfrontend/fronthelpers/rangeinput_impl.cpp
fronthelpers/rangeinput_impl.h svnfrontend/fronthelpers/rangeinput_impl.h
fronthelpers/revisionbuttonimpl.cpp svnfrontend/fronthelpers/revisionbuttonimpl.cpp
fronthelpers/revisionbuttonimpl.h svnfrontend/fronthelpers/revisionbuttonimpl.h
fronthelpers/cursorstack.h svnfrontend/fronthelpers/cursorstack.h
fronthelpers/widgetblockstack.cpp svnfrontend/fronthelpers/widgetblockstack.cpp
fronthelpers/widgetblockstack.h svnfrontend/fronthelpers/widgetblockstack.h
fronthelpers/propertylist.cpp svnfrontend/fronthelpers/propertylist.cpp
fronthelpers/propertylist.h svnfrontend/fronthelpers/propertylist.h
fronthelpers/propertyitem.cpp svnfrontend/fronthelpers/propertyitem.cpp
fronthelpers/propertyitem.h svnfrontend/fronthelpers/propertyitem.h
graphtree/drawparams.cpp svnfrontend/graphtree/drawparams.cpp
graphtree/drawparams.h svnfrontend/graphtree/drawparams.h
graphtree/elogentry.cpp svnfrontend/graphtree/elogentry.cpp
graphtree/elogentry.h svnfrontend/graphtree/elogentry.h
graphtree/graphtreelabel.cpp svnfrontend/graphtree/graphtreelabel.cpp
graphtree/graphtreelabel.h svnfrontend/graphtree/graphtreelabel.h
graphtree/pannerview.cpp svnfrontend/graphtree/pannerview.cpp
graphtree/pannerview.h svnfrontend/graphtree/pannerview.h
graphtree/revgraphview.cpp svnfrontend/graphtree/revgraphview.cpp
graphtree/revgraphview.h svnfrontend/graphtree/revgraphview.h
graphtree/revisiontree.cpp svnfrontend/graphtree/revisiontree.cpp
graphtree/revisiontree.h svnfrontend/graphtree/revisiontree.h
graphtree/revtreewidget.cpp svnfrontend/graphtree/revtreewidget.cpp
graphtree/revtreewidget.h svnfrontend/graphtree/revtreewidget.h
hotcopydlg_impl.cpp svnfrontend/hotcopydlg_impl.cpp
importdir_logmsg.cpp svnfrontend/importdir_logmsg.cpp
itemdisplay.cpp svnfrontend/itemdisplay.cpp
tdesvnfilelist.cpp svnfrontend/tdesvnfilelist.cpp
keystatus.cpp svnfrontend/keystatus.cpp
loaddmpdlg_impl.cpp svnfrontend/loaddmpdlg_impl.cpp
mergedlg_impl.cpp svnfrontend/mergedlg_impl.cpp
modifiedthread.cpp svnfrontend/modifiedthread.cpp
opencontextmenu.cpp svnfrontend/opencontextmenu.cpp
propertiesdlg.cpp svnfrontend/propertiesdlg.cpp
stopdlg.cpp svnfrontend/stopdlg.cpp
svnactions.cpp svnfrontend/svnactions.cpp
svnfiletip.cpp svnfrontend/svnfiletip.cpp
svnitem.cpp svnfrontend/svnitem.cpp
svnlogdlgimp.cpp svnfrontend/svnlogdlgimp.cpp
tcontextlistener.cpp svnfrontend/tcontextlistener.cpp
blamedisplay_impl.cpp svnfrontend/blamedisplay_impl.cpp
threadcontextlistenerdata.cpp svnfrontend/threadcontextlistenerdata.cpp
fillcachethread.cpp svnfrontend/fillcachethread.cpp
fillcachethread.h svnfrontend/fillcachethread.h
copymoveview.ui svnfrontend/copymoveview.ui
createrepo_dlg.ui svnfrontend/createrepo_dlg.ui
dumprepo_dlg.ui svnfrontend/dumprepo_dlg.ui
editpropsdlg.ui svnfrontend/editpropsdlg.ui
fronthelpers/checkoutinfo.ui svnfrontend/fronthelpers/checkoutinfo.ui
fronthelpers/rangeinput.ui svnfrontend/fronthelpers/rangeinput.ui
fronthelpers/revisionbutton.ui svnfrontend/fronthelpers/revisionbutton.ui
hotcopydlg.ui svnfrontend/hotcopydlg.ui
loaddmpdlg.ui svnfrontend/loaddmpdlg.ui
merge_dlg.ui svnfrontend/merge_dlg.ui
blamedisplay.ui svnfrontend/blamedisplay.ui
svnlogdlg.ui svnfrontend/svnlogdlg.ui
# LINK kio-shared # LINK kio-shared
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
) )
@ -152,12 +150,13 @@ tde_add_library( svnfrontend STATIC AUTOMOC
##### ksvnwidgets ############################### ##### ksvnwidgets ###############################
tde_add_library( ksvnwidgets STATIC AUTOMOC tde_add_library( ksvnwidgets STATIC AUTOMOC
SOURCES authdialogimpl.cpp logmsg_impl.cpp ssltrustprompt_impl.cpp SOURCES ksvnwidgets/authdialogimpl.cpp ksvnwidgets/logmsg_impl.cpp
pwstorage.cpp diffbrowser.cpp diffbrowserdata.cpp ksvnwidgets/ssltrustprompt_impl.cpp ksvnwidgets/pwstorage.cpp
diffsyntax.cpp encodingselector_impl.cpp depthselector.cpp ksvnwidgets/diffbrowser.cpp ksvnwidgets/diffbrowserdata.cpp
revertform_impl.cpp logmessage.ui ksvnwidgets/diffsyntax.cpp ksvnwidgets/encodingselector_impl.cpp
ssltrustprompt.ui authdlg.ui encodingselector.ui ksvnwidgets/depthselector.cpp ksvnwidgets/revertform_impl.cpp
depthform.ui revertform.ui ksvnwidgets/logmessage.ui ksvnwidgets/ssltrustprompt.ui ksvnwidgets/authdlg.ui
ksvnwidgets/encodingselector.ui ksvnwidgets/depthform.ui ksvnwidgets/revertform.ui
# LINK kio-shared # LINK kio-shared
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
) )
@ -166,7 +165,7 @@ tde_add_library( ksvnwidgets STATIC AUTOMOC
##### kio_ksvn ################################## ##### kio_ksvn ##################################
tde_add_kpart( kio_ksvn AUTOMOC 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 LINK kio_ksvn svnqt tdesvnhelpers tdesvncfgreader tdecore-shared tdeui-shared DCOP-shared kio-shared kwallet-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

Loading…
Cancel
Save