diff --git a/CMakeLists.txt b/CMakeLists.txt index e050f0f0..1152c29e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,210 +1,210 @@ cmake_minimum_required(VERSION 2.8.12) project(KTORRENT) set (QT_MIN_VERSION "5.7.0") set (KF5_MIN_VERSION "5.15") find_package(ECM REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/") include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings NO_POLICY_SCOPE) include(FeatureSummary) include(GenerateExportHeader) include(ECMInstallIcons) include(ECMAddAppIcon) include(ECMMarkAsTest) include(ECMMarkNonGuiExecutable) find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Network Script Widgets ) find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config ConfigWidgets CoreAddons Crash DBusAddons I18n IconThemes KIO Notifications NotifyConfig KCMUtils Parts Solid WidgetsAddons WindowSystem XmlGui OPTIONAL_COMPONENTS DocTools ) -find_package(KF5Torrent 2.1 CONFIG REQUIRED) +find_package(KF5Torrent 2.2 CONFIG REQUIRED) find_package(Boost REQUIRED) find_package(KF5TextWidgets ${KF5_REQUIRED_VERSION}) set_package_properties(KF5TextWidgets PROPERTIES TYPE OPTIONAL PURPOSE "Required for KTorrent's IP Filter plugin" ) if(KF5TextWidgets_FOUND) set(HAVE_KF5TextWidgets 1) endif() find_package(KF5Archive ${KF5_REQUIRED_VERSION}) set_package_properties(KF5Archive PROPERTIES TYPE OPTIONAL PURPOSE "Required for KTorrent's scripting plugin" ) if(KF5Archive_FOUND) set(HAVE_KF5Archive 1) endif() find_package(KF5ItemViews ${KF5_REQUIRED_VERSION}) set_package_properties(KF5ItemViews PROPERTIES TYPE OPTIONAL PURPOSE "Required for KTorrent's scripting plugin" ) if(KF5ItemViews_FOUND) set(HAVE_KF5ItemViews 1) endif() find_package(KF5Kross ${KF5_REQUIRED_VERSION}) set_package_properties(KF5Kross PROPERTIES TYPE OPTIONAL PURPOSE "Required for KTorrent's scripting plugin" ) if(KF5Kross_FOUND) set(HAVE_KF5Kross 1) endif() find_package(KF5Plotting ${KF5_REQUIRED_VERSION}) set_package_properties(KF5Plotting PROPERTIES TYPE OPTIONAL PURPOSE "Required for KTorrent's statistics plugin" ) if(KF5Plotting_FOUND) set(HAVE_KF5Plotting 1) endif() find_package(KF5Syndication) set_package_properties(KF5Syndication PROPERTIES TYPE OPTIONAL PURPOSE "Required for KTorrent's syndication plugin" ) if(KF5Syndication_FOUND) set(HAVE_KF5Syndication 1) endif() find_package(Qt5WebEngineWidgets ${QT_MIN_VERSION}) set_package_properties(Qt5WebEngineWidgets PROPERTIES TYPE OPTIONAL PURPOSE "Required for KTorrent's search and syndication plugins" ) if(Qt5WebEngineWidgets_FOUND) set(HAVE_Qt5WebEngineWidgets 1) endif() find_package(KF5DNSSD ${KF5_REQUIRED_VERSION}) set_package_properties(KF5DNSSD PROPERTIES TYPE OPTIONAL PURPOSE "Required for KTorrent's Zeroconf plugin" ) if(KF5DNSSD_FOUND) set(HAVE_KF5DNSSD 1) endif() find_package(KF5Completion ${KF5_REQUIRED_VERSION}) set_package_properties(KF5Completion PROPERTIES TYPE OPTIONAL PURPOSE "Required for KTorrent's UPnP plugin" ) if(KF5Completion_FOUND) set(HAVE_KF5Completion 1) endif() find_package(LibKWorkspace CONFIG) set_package_properties(LibKWorkspace PROPERTIES TYPE OPTIONAL PURPOSE "Required for KTorrent's shutdown plugin" ) if(LibKWorkspace_FOUND) set(HAVE_LibKWorkspace 1) endif() find_package(Taglib) if(TAGLIB_FOUND) set(HAVE_Taglib 1) endif() #find_package(Qt5 ${QT_MIN_VERSION} OPTIONAL_COMPONENTS Multimedia MultimediaWidgets) find_package(Phonon4Qt5) set_package_properties(Taglib PROPERTIES TYPE OPTIONAL PURPOSE "Required for KTorrent's multimedia plugin" ) set_package_properties(Phonon4Qt5 PROPERTIES TYPE OPTIONAL PURPOSE "Required for KTorrent's multimedia plugin" ) # # checks for functions and stuff # include(CheckIncludeFiles) include(CheckFunctionExists) include(CheckTypeSize) #XFS # according to http://www.cmake.org/pipermail/cmake/2008-June/022381.html kde_enable_exceptions() add_definitions( -DQT_USE_QSTRINGBUILDER -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII -DQT_STRICT_ITERATORS -DQT_NO_URL_CAST_FROM_STRING -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_CAST_TO_BYTEARRAY # -DQT_NO_SIGNALS_SLOTS_KEYWORDS -DQT_USE_FAST_OPERATOR_PLUS ) set (KTORRENT_DBUS_XML_DIR ${KTORRENT_SOURCE_DIR}/dbus_xml) set (KTORRENT_PLUGIN_INSTALL_DIR ${PLUGIN_INSTALL_DIR}/ktorrent) include_directories( ${Boost_INCLUDE_DIR} ) add_subdirectory(libktcore) add_subdirectory(plugins) add_subdirectory(ktorrent) add_subdirectory(ktupnptest) #add_subdirectory(plasma) add_subdirectory(ktmagnetdownloader) if (KF5DocTools_FOUND) add_subdirectory(doc) endif() feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/libktcore/ktversion.h b/libktcore/ktversion.h index 1d137d01..fbbbf88e 100644 --- a/libktcore/ktversion.h +++ b/libktcore/ktversion.h @@ -1,39 +1,39 @@ /*************************************************************************** * Copyright (C) 2005 by Joris Guisson * * joris.guisson@gmail.com * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #ifndef KTVERSION_HH #define KTVERSION_HH #include #include "util/constants.h" -#define KT_VERSION_MACRO "5.1.2" +#define KT_VERSION_MACRO "5.2.0" namespace kt { const bt::Uint32 MAJOR = 5; - const bt::Uint32 MINOR = 1; + const bt::Uint32 MINOR = 2; const bt::Uint32 RELEASE = 0; const bt::VersionType VERSION_TYPE = bt::DEVEL; const char VERSION_STRING[] = KT_VERSION_MACRO; } #endif