From f3e7f4bd154037a7ed8c5a5fa6a9486260895eb5 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Nov 2011 17:32:00 -0600 Subject: [PATCH] Fix FTBFS --- src/CMakeLists.txt | 57 ++++++++++++++++++++++++++++-------- src/tdesvnd/CMakeLists.txt | 10 +------ src/tdesvnd/tdesvnd_dcop.cpp | 22 +++++++------- src/tdesvnd/tdesvnd_dcop.h | 2 +- 4 files changed, 58 insertions(+), 33 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 246f11a..8397430 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -59,12 +59,23 @@ tde_add_executable( tdesvn AUTOMOC ) +##### tdesvnevents ############################### + +set( target tdesvnevents ) + +tde_add_library( tdesvnevents SHARED AUTOMOC + SOURCES tdesvn_events.cpp tdesvn_events.h + LINK tdecore-shared svnqt + DESTINATION ${LIB_INSTALL_DIR} +) + + ##### tdesvnpart ################################# set( target tdesvnpart ) set( ${target}_SRCS - tdesvn_events.cpp tdesvn_events.h tdesvn_part.cpp settings/tdesvnsettings.kcfgc + tdesvn_part.cpp settings/tdesvnsettings.kcfgc settings/dispcolor_settings.ui settings/display_settings.ui settings/revisiontree_settings.ui settings/subversion_settings.ui settings/cmdexecsettings.ui settings/diffmergesettings.ui @@ -73,14 +84,29 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK tdecore-shared kio-shared kparts-shared tdeui-shared + LINK tdecore-shared kio-shared kparts-shared tdeui-shared svnqt tdesvnhelpers tdesvnevents tdesvncfgreader ksvnwidgets svnfrontend + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### kded_tdesvnd ############################## + +tde_add_kpart( kded_tdesvnd AUTOMOC + SOURCES tdesvnd/tdesvnd_dcop.cpp tdesvnd/tdesvnd_dcop.skel tdesvnd/tdesvnd_dcop.h + LINK svnqt ksvnwidgets tdesvnhelpers tdesvncfgreader tdecore-shared tdeui-shared DCOP-shared kio-shared tdeinit_kded-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) +# RAJA +ADD_DEPENDENCIES(kded_tdesvnd-module tdesvnhelpers-shared) +ADD_DEPENDENCIES(kded_tdesvnd-module tdesvncfgreader-shared) +ADD_DEPENDENCIES(kded_tdesvnd-module tdesvnevents-shared) +ADD_DEPENDENCIES(kded_tdesvnd-module ksvnwidgets-shared) + ##### svnfrontend ############################### -tde_add_library( svnfrontend STATIC AUTOMOC +tde_add_library( svnfrontend SHARED AUTOMOC SOURCES svnfrontend/ccontextlistener.cpp svnfrontend/commandexec.cpp svnfrontend/copymoveview_impl.cpp @@ -148,14 +174,18 @@ tde_add_library( svnfrontend STATIC AUTOMOC svnfrontend/merge_dlg.ui svnfrontend/blamedisplay.ui svnfrontend/svnlogdlg.ui -# LINK kio-shared + commandline.cpp + commandline_part.cpp + tdesvnview.cpp + tdesvn_part.cpp # RAJA + LINK svnqt tdecore-shared tdesvnhelpers tdesvnevents tdesvncfgreader tdeui-shared ksvnwidgets kio-shared kparts-shared DESTINATION ${LIB_INSTALL_DIR} ) ##### ksvnwidgets ############################### -tde_add_library( ksvnwidgets STATIC AUTOMOC +tde_add_library( ksvnwidgets SHARED AUTOMOC SOURCES ksvnwidgets/authdialogimpl.cpp ksvnwidgets/logmsg_impl.cpp ksvnwidgets/ssltrustprompt_impl.cpp ksvnwidgets/pwstorage.cpp ksvnwidgets/diffbrowser.cpp ksvnwidgets/diffbrowserdata.cpp @@ -163,10 +193,12 @@ tde_add_library( ksvnwidgets STATIC AUTOMOC 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 + LINK tdesvnhelpers tdesvncfgreader svnqt tdecore-shared tdeui-shared kio-shared DESTINATION ${LIB_INSTALL_DIR} ) +ADD_DEPENDENCIES(ksvnwidgets-shared tdesvncfgreader-shared) + ##### kio_ksvn ################################## @@ -176,22 +208,23 @@ tde_add_kpart( kio_ksvn AUTOMOC DESTINATION ${PLUGIN_INSTALL_DIR} ) -ADD_DEPENDENCIES(kio_ksvn-module tdesvnhelpers-static) -ADD_DEPENDENCIES(kio_ksvn-module tdesvncfgreader-static) +ADD_DEPENDENCIES(kio_ksvn-module tdesvnhelpers-shared) +ADD_DEPENDENCIES(kio_ksvn-module tdesvncfgreader-shared) +ADD_DEPENDENCIES(kio_ksvn-module tdesvnevents-shared) ##### tdesvnhelpers ############################## -tde_add_library( tdesvnhelpers STATIC_PIC AUTOMOC +tde_add_library( tdesvnhelpers SHARED AUTOMOC SOURCES helpers/ktranslateurl.cpp helpers/sshagent.cpp helpers/sub2qt.cpp -# LINK kio-shared + LINK tdecore-shared svnqt DESTINATION ${LIB_INSTALL_DIR} ) ##### tdesvncfgreader ########################### -tde_add_library( tdesvncfgreader STATIC_PIC AUTOMOC +tde_add_library( tdesvncfgreader SHARED AUTOMOC SOURCES settings/dispcolor_settings.ui settings/display_settings.ui settings/revisiontree_settings.ui settings/subversion_settings.ui settings/cmdexecsettings.ui @@ -199,7 +232,7 @@ tde_add_library( tdesvncfgreader STATIC_PIC AUTOMOC settings/displaysettings_impl.cpp settings/revisiontreesettingsdlg_impl.cpp settings/subversionsettings_impl.cpp settings/cmdexecsettings_impl.cpp settings/diffmergesettings_impl.cpp settings/tdesvnsettings.kcfgc -# LINK kio-shared + LINK tdecore-shared tdeui-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/src/tdesvnd/CMakeLists.txt b/src/tdesvnd/CMakeLists.txt index 4b7ebad..4e758a1 100644 --- a/src/tdesvnd/CMakeLists.txt +++ b/src/tdesvnd/CMakeLists.txt @@ -20,15 +20,7 @@ include_directories( link_directories( ${TQT_LIBRARY_DIRS} -) - - -##### kded_tdesvnd ############################## - -tde_add_kpart( kded_tdesvnd AUTOMOC - SOURCES tdesvnd_dcop.cpp - LINK kio_ksvn kded_tdesvnd svnqt ksvnwidgets tdesvnhelpers tdesvncfgreader tdecore-shared tdeui-shared DCOP-shared kio-shared kwallet-shared - DESTINATION ${PLUGIN_INSTALL_DIR} + ${CMAKE_BINARY_DIR}/src ) diff --git a/src/tdesvnd/tdesvnd_dcop.cpp b/src/tdesvnd/tdesvnd_dcop.cpp index 67962de..9575f78 100644 --- a/src/tdesvnd/tdesvnd_dcop.cpp +++ b/src/tdesvnd/tdesvnd_dcop.cpp @@ -20,17 +20,17 @@ #include "tdesvn-config.h" #include "tdesvnd_dcop.h" -#include "src/ksvnwidgets/authdialogimpl.h" -#include "src/ksvnwidgets/ssltrustprompt_impl.h" -#include "src/ksvnwidgets/logmsg_impl.h" -#include "src/settings/tdesvnsettings.h" -#include "src/ksvnwidgets/pwstorage.h" -#include "src/svnqt/client.hpp" -#include "src/svnqt/revision.hpp" -#include "src/svnqt/status.hpp" -#include "src/svnqt/context_listener.hpp" -#include "src/svnqt/url.hpp" -#include "helpers/ktranslateurl.h" +#include "authdialogimpl.h" +#include "ssltrustprompt_impl.h" +#include "logmsg_impl.h" +#include "tdesvnsettings.h" +#include "pwstorage.h" +#include "client.hpp" +#include "revision.hpp" +#include "status.hpp" +#include "context_listener.hpp" +#include "url.hpp" +#include "ktranslateurl.h" #include #include diff --git a/src/tdesvnd/tdesvnd_dcop.h b/src/tdesvnd/tdesvnd_dcop.h index 6783994..dd28340 100644 --- a/src/tdesvnd/tdesvnd_dcop.h +++ b/src/tdesvnd/tdesvnd_dcop.h @@ -32,7 +32,7 @@ class IListener; class tdesvnd_dcop : public KDEDModule { - Q_OBJECT +// Q_OBJECT // TQ_OBJECT K_DCOP