From 1eb3b7ccaac36b08d2459d1a97b13ecfd9cac039 Mon Sep 17 00:00:00 2001 From: "Friedrich W. H. Kossebau" Date: Sat, 19 Jan 2019 16:09:29 +0100 Subject: [PATCH] Remove explicit use of ECM_KDE_MODULE_DIR, part of ECM_MODULE_PATH GIT_SILENT --- CMakeLists.txt | 2 +- templates/cpp-plasmoid/CMakeLists.txt | 2 +- templates/plasma-wallpaper-with-qml-extension/CMakeLists.txt | 2 +- templates/plasma-wallpaper/CMakeLists.txt | 2 +- templates/qml-plasmoid-with-qml-extension/CMakeLists.txt | 2 +- templates/qml-plasmoid/CMakeLists.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b96eda9d..91ade0a16 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ find_package(ECM 5.54.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules") feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) -set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) +set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(GenerateExportHeader) include(ECMGenerateHeaders) diff --git a/templates/cpp-plasmoid/CMakeLists.txt b/templates/cpp-plasmoid/CMakeLists.txt index f63e36333..8932de40a 100644 --- a/templates/cpp-plasmoid/CMakeLists.txt +++ b/templates/cpp-plasmoid/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0) project(plasma-%{APPNAMELC}) find_package(ECM 1.4.0 REQUIRED NO_MODULE) -set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) +set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(KDEInstallDirs) include(KDECMakeSettings) diff --git a/templates/plasma-wallpaper-with-qml-extension/CMakeLists.txt b/templates/plasma-wallpaper-with-qml-extension/CMakeLists.txt index 3830662a8..176dd4404 100644 --- a/templates/plasma-wallpaper-with-qml-extension/CMakeLists.txt +++ b/templates/plasma-wallpaper-with-qml-extension/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0) project(plasma-%{APPNAMELC}) find_package(ECM 1.4.0 REQUIRED NO_MODULE) -set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) +set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(KDEInstallDirs) include(KDECMakeSettings) diff --git a/templates/plasma-wallpaper/CMakeLists.txt b/templates/plasma-wallpaper/CMakeLists.txt index 1b9957dfc..ef1b9f4b6 100644 --- a/templates/plasma-wallpaper/CMakeLists.txt +++ b/templates/plasma-wallpaper/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0) project(plasma-%{APPNAMELC}) find_package(ECM 1.4.0 REQUIRED NO_MODULE) -set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) +set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) find_package(KF5Plasma REQUIRED) diff --git a/templates/qml-plasmoid-with-qml-extension/CMakeLists.txt b/templates/qml-plasmoid-with-qml-extension/CMakeLists.txt index ba0ff4aa9..3613f1853 100644 --- a/templates/qml-plasmoid-with-qml-extension/CMakeLists.txt +++ b/templates/qml-plasmoid-with-qml-extension/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0) project(plasma-%{APPNAMELC}) find_package(ECM 1.4.0 REQUIRED NO_MODULE) -set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) +set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(KDEInstallDirs) include(KDECMakeSettings) diff --git a/templates/qml-plasmoid/CMakeLists.txt b/templates/qml-plasmoid/CMakeLists.txt index 31b6f6456..1f1add493 100644 --- a/templates/qml-plasmoid/CMakeLists.txt +++ b/templates/qml-plasmoid/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0) project(plasma-%{APPNAMELC}) find_package(ECM 1.4.0 REQUIRED NO_MODULE) -set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) +set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) find_package(KF5Plasma REQUIRED)