From 28972708f207ca1dc4f2f0db371e6a05d7a88fa2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Nov 2011 22:56:44 -0600 Subject: Merge additional cmake files --- src/CMakeLists.txt | 30 ++++++++++++++++++++++++++++-- src/helpers/CMakeLists.txt | 20 -------------------- src/helpers/sub2qt.h | 2 +- src/kiosvn/kiobytestream.h | 2 +- src/kiosvn/kiosvn.cpp | 18 +++++++++--------- src/ksvnwidgets/pwstorage.cpp | 2 +- src/ksvnwidgets/pwstorage.h | 1 + src/settings/CMakeLists.txt | 15 --------------- 8 files changed, 41 insertions(+), 49 deletions(-) (limited to 'src') 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 ) diff --git a/src/helpers/CMakeLists.txt b/src/helpers/CMakeLists.txt index 66784a7..5431b5d 100644 --- a/src/helpers/CMakeLists.txt +++ b/src/helpers/CMakeLists.txt @@ -8,23 +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 -) - -link_directories( - ${TQT_LIBRARY_DIRS} -) - -##### tdesvnhelpers ############################## - -tde_add_library( tdesvnhelpers STATIC AUTOMOC - SOURCES ktranslateurl.cpp sshagent.cpp sub2qt.cpp -# LINK kio-shared - DESTINATION ${LIB_INSTALL_DIR} -) diff --git a/src/helpers/sub2qt.h b/src/helpers/sub2qt.h index c6ddb6d..bc158df 100644 --- a/src/helpers/sub2qt.h +++ b/src/helpers/sub2qt.h @@ -20,7 +20,7 @@ #ifndef HELPERSSUB2TQT_H #define HELPERSSUB2TQT_H -#include "src/svnqt/datetime.hpp" +#include "datetime.hpp" #include #include #include diff --git a/src/kiosvn/kiobytestream.h b/src/kiosvn/kiobytestream.h index 2fe8e57..808277c 100644 --- a/src/kiosvn/kiobytestream.h +++ b/src/kiosvn/kiobytestream.h @@ -20,7 +20,7 @@ #ifndef KIOBYTESTREAM_H #define KIOBYTESTREAM_H -#include "src/svnqt/svnstream.hpp" +#include "svnstream.hpp" #include #include diff --git a/src/kiosvn/kiosvn.cpp b/src/kiosvn/kiosvn.cpp index 64d0009..0773d6d 100644 --- a/src/kiosvn/kiosvn.cpp +++ b/src/kiosvn/kiosvn.cpp @@ -21,15 +21,15 @@ #include "kiosvn.h" #include "kiolistener.h" -#include "src/svnqt/svnqttypes.hpp" -#include "src/svnqt/dirent.hpp" -#include "src/svnqt/url.hpp" -#include "src/svnqt/status.hpp" -#include "src/svnqt/targets.hpp" -#include "src/svnqt/info_entry.hpp" -#include "src/settings/tdesvnsettings.h" -#include "src/helpers/sub2qt.h" -#include "src/helpers/sshagent.h" +#include "svnqttypes.hpp" +#include "dirent.hpp" +#include "url.hpp" +#include "status.hpp" +#include "targets.hpp" +#include "info_entry.hpp" +#include "tdesvnsettings.h" +#include "sub2qt.h" +#include "sshagent.h" #include #include diff --git a/src/ksvnwidgets/pwstorage.cpp b/src/ksvnwidgets/pwstorage.cpp index 9710c59..16c421f 100644 --- a/src/ksvnwidgets/pwstorage.cpp +++ b/src/ksvnwidgets/pwstorage.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "pwstorage.h" #include "tdesvn-config.h" -#include "src/settings/tdesvnsettings.h" +#include "tdesvnsettings.h" #include #include diff --git a/src/ksvnwidgets/pwstorage.h b/src/ksvnwidgets/pwstorage.h index 821005e..bf710db 100644 --- a/src/ksvnwidgets/pwstorage.h +++ b/src/ksvnwidgets/pwstorage.h @@ -22,6 +22,7 @@ #include #include +#include class PwStorageData; diff --git a/src/settings/CMakeLists.txt b/src/settings/CMakeLists.txt index bd1ee7e..8eb48e7 100644 --- a/src/settings/CMakeLists.txt +++ b/src/settings/CMakeLists.txt @@ -24,21 +24,6 @@ link_directories( ) -##### tdesvncfgreader ########################### - -tde_add_library( tdesvncfgreader STATIC AUTOMOC - SOURCES dispcolor_settings.ui - display_settings.ui revisiontree_settings.ui - subversion_settings.ui cmdexecsettings.ui - diffmergesettings.ui dispcolorsettings_impl.cpp - displaysettings_impl.cpp revisiontreesettingsdlg_impl.cpp - subversionsettings_impl.cpp cmdexecsettings_impl.cpp - diffmergesettings_impl.cpp tdesvnsettings.kcfgc -# LINK kio-shared - DESTINATION ${LIB_INSTALL_DIR} -) - - ##### data files ################################ install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/tdesvn_part.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) -- cgit v1.2.3