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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f83af45c19b8eeb5ab6e418b286b39ddd2b84c0..b594c14058edd1f3e033e41844f8472af9f5eb4b 100644 (file)
--- 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 7e7a2296fd35a52957288e40ba3614a180d4db1a..f544f4c610ed4232cefbaa64595ee9d298c0908c 100644 (file)
--- a/DolphinVcsConfig.cmake.in
+++ b/DolphinVcsConfig.cmake.in
@@ -1,5 +1,7 @@
 @PACKAGE_INIT@
 
+include(CMakeFindDependencyMacro)
+
 find_dependency(Qt5Widgets)
 find_dependency(KF5KIO)