From 67ba735507eb477d352251941e7a210f7c306ade Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Nov 2011 02:15:45 -0600
Subject: Fix more FTBFS problems

---
 src/CMakeLists.txt | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5bf93c9..246f11a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -18,15 +18,19 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/src/settings
   ${CMAKE_SOURCE_DIR}/src/svnqt
   ${CMAKE_BINARY_DIR}/src/svnqt
-  ${CMAKE_SOURCE_DIR}/src/svnfrontend/fronthelpers/
+  ${CMAKE_SOURCE_DIR}/src/svnfrontend/graphtree
+  ${CMAKE_SOURCE_DIR}/src/svnfrontend/fronthelpers
   ${CMAKE_SOURCE_DIR}/src/ksvnwidgets
   ${CMAKE_SOURCE_DIR}/src/helpers
+  ${CMAKE_SOURCE_DIR}/src/svnfrontend
+  ${CMAKE_SOURCE_DIR}/src/svnqt/cache
   ${SUBVERSION_INCLUDE_DIR}
   /usr/include/apr-1.0
 )
 
 link_directories(
   ${TQT_LIBRARY_DIRS}
+  ${CMAKE_BINARY_DIR}/src
 )
 
 
@@ -168,14 +172,17 @@ 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 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
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
+ADD_DEPENDENCIES(kio_ksvn-module tdesvnhelpers-static)
+ADD_DEPENDENCIES(kio_ksvn-module tdesvncfgreader-static)
+
 
 ##### tdesvnhelpers ##############################
 
-tde_add_library( tdesvnhelpers STATIC AUTOMOC
+tde_add_library( tdesvnhelpers STATIC_PIC AUTOMOC
   SOURCES helpers/ktranslateurl.cpp helpers/sshagent.cpp helpers/sub2qt.cpp
 #  LINK kio-shared
   DESTINATION ${LIB_INSTALL_DIR}
@@ -184,7 +191,7 @@ tde_add_library( tdesvnhelpers STATIC AUTOMOC
 
 ##### tdesvncfgreader ###########################
 
-tde_add_library( tdesvncfgreader STATIC AUTOMOC
+tde_add_library( tdesvncfgreader STATIC_PIC AUTOMOC
   SOURCES settings/dispcolor_settings.ui
     settings/display_settings.ui settings/revisiontree_settings.ui
     settings/subversion_settings.ui settings/cmdexecsettings.ui
-- 
cgit v1.2.3