From b6c108cbf3808e9c2e17864ad814b69cefdc4428 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 26 Nov 2011 22:31:57 -0600
Subject: [PATCH] Merge cmake files

---
 admin                          |   2 +-
 src/CMakeLists.txt             | 100 ++++++++++++++++++++++++++++++++-
 src/kiosvn/CMakeLists.txt      |   9 ---
 src/ksvnwidgets/CMakeLists.txt |  29 ----------
 src/svnfrontend/CMakeLists.txt |  91 ------------------------------
 src/tdesvn_part.cpp            |   4 +-
 6 files changed, 102 insertions(+), 133 deletions(-)

diff --git a/admin b/admin
index 26d642b..21cb4a9 160000
--- a/admin
+++ b/admin
@@ -1 +1 @@
-Subproject commit 26d642b2620397b76d5fbb64a9ef5ca8f2334f72
+Subproject commit 21cb4a9d2a0e083b10dee6d22958c4f58de6c5b2
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1dba60d..104973e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -69,7 +69,105 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK tdecore-shared kio-shared kparts-shared tdeui-shared kwallet-shared
+  LINK tdecore-shared kio-shared kparts-shared tdeui-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### 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
+#  LINK kio-shared
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
+
+##### 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
+#  LINK kio-shared
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
+
+##### kio_ksvn ##################################
+
+tde_add_kpart( kio_ksvn AUTOMOC
+  SOURCES kiosvn.cpp kiolistener.cpp 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}
 )
 
diff --git a/src/kiosvn/CMakeLists.txt b/src/kiosvn/CMakeLists.txt
index c61f4f2..cb84de5 100644
--- a/src/kiosvn/CMakeLists.txt
+++ b/src/kiosvn/CMakeLists.txt
@@ -22,15 +22,6 @@ link_directories(
 )
 
 
-##### kio_ksvn ##################################
-
-tde_add_kpart( kio_ksvn AUTOMOC
-  SOURCES kiosvn.cpp kiolistener.cpp 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}
-)
-
-
 ##### protocol files ############################
 
 file( GLOB PROTFILES *.protocol )
diff --git a/src/ksvnwidgets/CMakeLists.txt b/src/ksvnwidgets/CMakeLists.txt
index 93c9501..5431b5d 100644
--- a/src/ksvnwidgets/CMakeLists.txt
+++ b/src/ksvnwidgets/CMakeLists.txt
@@ -8,32 +8,3 @@
 #  This file is released under GPL >= 2
 #
 #################################################
-
-include_directories(
-  ${TQT_INCLUDE_DIRS}
-  ${TDE_INCLUDE_DIR}
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_BINARY_DIR}/src
-  ${CMAKE_SOURCE_DIR}/src
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_BINARY_DIR}/src/svnqt
-)
-
-link_directories(
-  ${TQT_LIBRARY_DIRS}
-)
-
-##### 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
-#  LINK kio-shared
-  DESTINATION ${LIB_INSTALL_DIR}
-)
-
-# ADD_DEPENDENCIES(ksvnwidgets tdesvncfgreader)
diff --git a/src/svnfrontend/CMakeLists.txt b/src/svnfrontend/CMakeLists.txt
index bbee4cd..5431b5d 100644
--- a/src/svnfrontend/CMakeLists.txt
+++ b/src/svnfrontend/CMakeLists.txt
@@ -8,94 +8,3 @@
 #  This file is released under GPL >= 2
 #
 #################################################
-
-include_directories(
-  ${TQT_INCLUDE_DIRS}
-  ${TDE_INCLUDE_DIR}
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_BINARY_DIR}/src
-  ${CMAKE_SOURCE_DIR}/src
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/src/svnfrontend/fronthelpers
-  ${CMAKE_BINARY_DIR}/src/svnqt
-)
-
-link_directories(
-  ${TQT_LIBRARY_DIRS}
-)
-
-##### 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
-#  LINK kio-shared
-  DESTINATION ${LIB_INSTALL_DIR}
-)
-
-# ADD_DEPENDENCIES(svnfrontend ksvnwidgets)
diff --git a/src/tdesvn_part.cpp b/src/tdesvn_part.cpp
index bc67df2..0be1b6d 100644
--- a/src/tdesvn_part.cpp
+++ b/src/tdesvn_part.cpp
@@ -28,8 +28,8 @@
 #include "cmdexecsettings_impl.h"
 #include "tdesvnview.h"
 #include "commandline_part.h"
-#include "src/svnqt/version_check.hpp"
-#include "src/svnqt/url.hpp"
+#include "version_check.hpp"
+#include "url.hpp"
 #include "helpers/ktranslateurl.h"
 #include "helpers/sshagent.h"