From d9e0377ec87657b2ccf9819d0859f173ee2b2246 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 1 Jan 2015 13:29:58 +0000 Subject: [PATCH] kget: attempt to fix libktorrent not being found on bootstrap --- kget/CMakeLists.txt | 3 --- kget/transfer-plugins/CMakeLists.txt | 4 +--- kget/transfer-plugins/bittorrent/CMakeLists.txt | 4 ++-- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/kget/CMakeLists.txt b/kget/CMakeLists.txt index 0bb48860..9c8bb313 100644 --- a/kget/CMakeLists.txt +++ b/kget/CMakeLists.txt @@ -33,9 +33,6 @@ macro_log_feature(QCA2_FOUND "QCA2" "Qt Cryptographic Architecture" "http://delt macro_optional_find_package(QGpgme) macro_log_feature(QGPGME_FOUND "QGpgME" "The QGpgME library" "http://www.kde.org" FALSE "" "QGpgME is required to have signature verifying support in KGet.") -macro_optional_find_package(KTorrent) -macro_log_feature(LIBKTORRENT_FOUND "libktorrent" "Backend Library of KTorrent" "http://ktorrent.org" FALSE "" "Needed to build KGet bittorrent support.") - macro_optional_find_package(LibMms) macro_log_feature(LIBMMS_FOUND "libmms" "Library to read mms streams" "http://libmms.sourceforge.net" FALSE "" "Needed to build KGet mms support.") diff --git a/kget/transfer-plugins/CMakeLists.txt b/kget/transfer-plugins/CMakeLists.txt index 34737166..f1cc568e 100644 --- a/kget/transfer-plugins/CMakeLists.txt +++ b/kget/transfer-plugins/CMakeLists.txt @@ -1,9 +1,7 @@ add_subdirectory(kio) add_subdirectory(multisegmentkio) add_subdirectory(metalink) -if (LIBKTORRENT_FOUND) - add_subdirectory(bittorrent) -endif (LIBKTORRENT_FOUND) +add_subdirectory(bittorrent) add_subdirectory(mirrorsearch) #add_subdirectory(contentfetch) if (LIBMMS_FOUND) diff --git a/kget/transfer-plugins/bittorrent/CMakeLists.txt b/kget/transfer-plugins/bittorrent/CMakeLists.txt index 6498f294..d528206d 100644 --- a/kget/transfer-plugins/bittorrent/CMakeLists.txt +++ b/kget/transfer-plugins/bittorrent/CMakeLists.txt @@ -5,7 +5,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}") include_directories( ../../ - ${LIBKTORRENT_INCLUDE_DIR} + ${CMAKE_SOURCE_DIR}/libktorrent ) set(kget_bittorrentfactory_PART_SRCS bttransfer.cpp @@ -45,7 +45,7 @@ kde4_add_ui_files(kget_bittorrentfactory_PART_SRCS kde4_add_kcfg_files(kget_bittorrentfactory_PART_SRCS bittorrentsettings.kcfgc) kde4_add_plugin(kget_bittorrentfactory ${kget_bittorrentfactory_PART_SRCS}) -target_link_libraries(kget_bittorrentfactory ${KDE4_KIO_LIBS} ${LIBKTORRENT_LIBRARIES} kgetcore) +target_link_libraries(kget_bittorrentfactory ${KDE4_KIO_LIBS} ktorrent kgetcore) install(TARGETS kget_bittorrentfactory DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES kget_bittorrentfactory.desktop DESTINATION ${SERVICES_INSTALL_DIR})