From 6097c084f5d32679a9abfdf3efe9e91c1fea7d2a Mon Sep 17 00:00:00 2001 From: Nicolas Fella Date: Wed, 11 Nov 2020 12:36:35 +0100 Subject: [PATCH] Misc cmake cleanup Remove unneede FindPhoneNumber Fix coding style Remove unneeded statements Require recent-ish cmake --- CMakeLists.txt | 30 ++++++------ cmake/FindPhoneNumber.cmake | 92 ------------------------------------- 2 files changed, 14 insertions(+), 108 deletions(-) delete mode 100644 cmake/FindPhoneNumber.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e67fa94..42b972fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,18 +1,15 @@ +cmake_minimum_required (VERSION 3.14 FATAL_ERROR) + project(plasma-phone-components) -# minimal requirements -cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) -set (QT_MIN_VERSION "5.15.0") +set(QT_MIN_VERSION "5.15.0") set(KF5_MIN_VERSION "5.74") -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -find_package(ECM 5.41.0 REQUIRED NO_MODULE) -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_SOURCE_DIR}/cmake) +find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) +set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) include(KDEInstallDirs) include(KDECMakeSettings) @@ -25,7 +22,11 @@ include(ECMGenerateHeaders) include(GenerateExportHeader) include(FeatureSummary) -find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core Qml Quick) +find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED + Core + Qml + Quick +) find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS I18n @@ -34,11 +35,8 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS PlasmaQuick Service Notifications + Wayland ) -find_package(KF5Wayland CONFIG) -set_package_properties(KF5Wayland PROPERTIES - TYPE REQUIRED - PURPOSE "Required for interacting with the compositor") # torch find_package(GStreamer 1.1.90 REQUIRED) @@ -50,10 +48,10 @@ include(CheckIncludeFiles) plasma_install_package(look-and-feel org.kde.plasma.phone look-and-feel) plasma_install_package(shell org.kde.plasma.phone shells) -install( DIRECTORY kwinmultitasking/ DESTINATION ${DATA_INSTALL_DIR}/kwin/scripts/org.kde.phone.multitasking ) -install( FILES kwinmultitasking/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR} RENAME kwin-script-org.kde.phone.multitasking.desktop ) +install(DIRECTORY kwinmultitasking/ DESTINATION ${DATA_INSTALL_DIR}/kwin/scripts/org.kde.phone.multitasking) +install(FILES kwinmultitasking/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR} RENAME kwin-script-org.kde.phone.multitasking.desktop) -install( DIRECTORY components/ DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/mobileshell ) +install(DIRECTORY components/ DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/mobileshell) add_subdirectory(bin) add_subdirectory(applets) diff --git a/cmake/FindPhoneNumber.cmake b/cmake/FindPhoneNumber.cmake deleted file mode 100644 index d9312731..00000000 --- a/cmake/FindPhoneNumber.cmake +++ /dev/null @@ -1,92 +0,0 @@ -#.rst: -# FindPhoneNumber -# --------------- -# -# This module finds if PhoneNumber is installed. -# -# This is a component-based find module, which makes use of the COMPONENTS and -# OPTIONAL_COMPONENTS arguments to find_module. The following components are -# available: -# -# PhoneNumber -# GeoCoding -# -# If no components are specified, this module will act as though all components -# were passed to OPTIONAL_COMPONENTS. -# -# This module will define the following variables, independently of the -# components searched for or found: -# -# ``PhoneNumber_FOUND`` -# True if (the requestion version of) PhoneNumber is available -# -# For each searched-for components, ``PhoneNumber__FOUND`` will be set to -# TRUE if the corresponding library was found, and FALSE otherwise. If -# ``PhoneNumber__FOUND`` is TRUE, the imported target ``PhoneNumber::`` -# will be defined. - -#============================================================================= -# Copyright (c) 2017 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com -# Copyright (c) 2018 Volker Krause -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# 3. The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#============================================================================= - -include(ECMFindModuleHelpersStub) - -ecm_find_package_version_check(PhoneNumber) - -set(PhoneNumber_known_components - PhoneNumber - GeoCoding -) -set(PhoneNumber_default_components ${PhoneNumber_known_components}) - -set(PhoneNumber_PhoneNumber_lib phonenumber) -set(PhoneNumber_PhoneNumber_header phonenumbers/phonenumberutil.h) -set(PhoneNumber_GeoCoding_lib geocoding) -set(PhoneNumber_GeoCoding_header phonenumbers/geocoding/phonenumber_offline_geocoder.h) - -ecm_find_package_parse_components(PhoneNumber - RESULT_VAR PhoneNumber_components - KNOWN_COMPONENTS ${PhoneNumber_known_components} - DEFAULT_COMPONENTS ${PhoneNumber_default_components} -) -ecm_find_package_handle_library_components(PhoneNumber - COMPONENTS ${PhoneNumber_components} -) -find_package_handle_standard_args(PhoneNumber - FOUND_VAR - PhoneNumber_FOUND - REQUIRED_VARS - PhoneNumber_LIBRARIES - VERSION_VAR - PhoneNumber_VERSION - HANDLE_COMPONENTS -) - -include(FeatureSummary) -set_package_properties(PhoneNumber PROPERTIES - URL "https://github.com/googlei18n/libphonenumber" - DESCRIPTION "Library for parsing, formatting, and validating international phone numbers")