From e207cfdbfc2df1548ae5ac033ee2e728a2e71398 Mon Sep 17 00:00:00 2001 From: Nicolas Fella Date: Tue, 6 Apr 2021 12:06:35 +0200 Subject: [PATCH] [dolphin] Clean up CMake code Remove some stuff that is not needed. Signed-off-by: Nicolas Fella --- shell_integration/dolphin/CMakeLists.txt | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/shell_integration/dolphin/CMakeLists.txt b/shell_integration/dolphin/CMakeLists.txt index aca4a2d517..f2fda6e1d3 100644 --- a/shell_integration/dolphin/CMakeLists.txt +++ b/shell_integration/dolphin/CMakeLists.txt @@ -1,25 +1,18 @@ project(dolphin-owncloud) cmake_minimum_required(VERSION 2.8.12) -include(FeatureSummary) + set(QT_MIN_VERSION "5.12.0") set(KF5_MIN_VERSION "5.16.0") set(KDE_INSTALL_USE_QT_SYS_PATHS ON CACHE BOOL "Install the plugin in the right directory") find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Network) -find_package(ECM 1.2.0 REQUIRED CONFIG) -set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/cmake") +find_package(ECM ${KF5_MIN_VERSION} REQUIRED CONFIG) +set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons KIO) -set_package_properties(DolphinVcs PROPERTIES - DESCRIPTION "the Dolphin plugin library" - URL "http://dolphin.kde.org/" - TYPE REQUIRED - PURPOSE "Provides plugin interfaces for Dolphin." -) - set(KDE_INSTALL_DIRS_NO_DEPRECATED TRUE) include(KDEInstallDirs) # Before KF5 5.54, kcoreaddons_add_plugin uses deprecated VAR PLUGIN_INSTALL_DIR @@ -28,16 +21,9 @@ include(KDEInstallDirs) set(PLUGIN_INSTALL_DIR "${KDE_INSTALL_PLUGINDIR}") include(KDECMakeSettings) include(KDECompilerSettings) -include(ECMMarkNonGuiExecutable) -include(GenerateExportHeader) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) -if (NOT DEFINED APPLICATION_EXECUTABLE ) - set ( APPLICATION_EXECUTABLE "owncloud" ) -endif() - #---HELPER--- set(OWNCLOUDDOLPHINHELPER ${APPLICATION_EXECUTABLE}dolphinpluginhelper) add_library(${OWNCLOUDDOLPHINHELPER} SHARED ownclouddolphinpluginhelper.cpp)