From cd90c04343ba73568c79cad5fa7afb7557460d5e Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Fri, 1 Dec 2017 19:01:59 +0100 Subject: [PATCH] Use CMakePackageConfigHelpers instead of the ECM variant Summary: dolphin already requires cmake >= 3.0, which includes the macro. Also make sure to include the CMakeFindDependencyMacro. Reviewers: #dolphin Differential Revision: https://phabricator.kde.org/D9091 --- CMakeLists.txt | 4 ++-- DolphinVcsConfig.cmake.in | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f83af45c1..b594c14058 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) include(ECMSetupVersion) include(ECMGenerateHeaders) -include(ECMPackageConfigHelpers) +include(CMakePackageConfigHelpers) include(GenerateExportHeader) include(FeatureSummary) include(KDEInstallDirs) @@ -108,7 +108,7 @@ add_subdirectory(doc) # CMake files set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/DolphinVcs") -ecm_configure_package_config_file( +configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/DolphinVcsConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/DolphinVcsConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} diff --git a/DolphinVcsConfig.cmake.in b/DolphinVcsConfig.cmake.in index 7e7a2296fd..f544f4c610 100644 --- a/DolphinVcsConfig.cmake.in +++ b/DolphinVcsConfig.cmake.in @@ -1,5 +1,7 @@ @PACKAGE_INIT@ +include(CMakeFindDependencyMacro) + find_dependency(Qt5Widgets) find_dependency(KF5KIO)