From 28972708f207ca1dc4f2f0db371e6a05d7a88fa2 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 26 Nov 2011 22:56:44 -0600
Subject: Merge additional cmake files

---
 src/CMakeLists.txt | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 24ab92b..5bf93c9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -19,7 +19,9 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/src/svnqt
   ${CMAKE_BINARY_DIR}/src/svnqt
   ${CMAKE_SOURCE_DIR}/src/svnfrontend/fronthelpers/
-  /usr/include/subversion-1
+  ${CMAKE_SOURCE_DIR}/src/ksvnwidgets
+  ${CMAKE_SOURCE_DIR}/src/helpers
+  ${SUBVERSION_INCLUDE_DIR}
   /usr/include/apr-1.0
 )
 
@@ -166,10 +168,34 @@ tde_add_library( ksvnwidgets STATIC AUTOMOC
 
 tde_add_kpart( kio_ksvn AUTOMOC
   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 svnqt tdesvnhelpers tdesvncfgreader tdecore-shared tdeui-shared DCOP-shared kio-shared kwallet-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
+
+##### tdesvnhelpers ##############################
+
+tde_add_library( tdesvnhelpers STATIC AUTOMOC
+  SOURCES helpers/ktranslateurl.cpp helpers/sshagent.cpp helpers/sub2qt.cpp
+#  LINK kio-shared
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
+
+##### tdesvncfgreader ###########################
+
+tde_add_library( tdesvncfgreader STATIC AUTOMOC
+  SOURCES settings/dispcolor_settings.ui
+    settings/display_settings.ui settings/revisiontree_settings.ui
+    settings/subversion_settings.ui settings/cmdexecsettings.ui
+    settings/diffmergesettings.ui settings/dispcolorsettings_impl.cpp
+    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
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
 add_subdirectory( svnqt )
 add_subdirectory( ksvnwidgets )
 add_subdirectory( settings )
-- 
cgit v1.2.1