From d103db4b2915b78c45dde512f1ec5db85652d552 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=80lex=20Fiestas?= Date: Thu, 27 Mar 2014 12:31:25 +0100 Subject: [PATCH] Use ecm_configure_package_config_file instead of configure_file Works better on all kind of systems (in concrete it fixes things for Debian users) --- CMakeLists.txt | 4 +++- KWinDBusInterfaceConfig.cmake.in | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 40112fdfe9..c0d6345c7c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -507,7 +507,9 @@ add_subdirectory(autotests) add_subdirectory(tests) add_subdirectory(doc) -configure_file(KWinDBusInterfaceConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/KWinDBusInterfaceConfig.cmake" @ONLY) set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KWinDBusInterface") +ecm_configure_package_config_file(KWinDBusInterfaceConfig.cmake.in + "${CMAKE_CURRENT_BINARY_DIR}/KWinDBusInterfaceConfig.cmake" + INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/KWinDBusInterfaceConfig.cmake DESTINATION ${CMAKECONFIG_INSTALL_DIR}) diff --git a/KWinDBusInterfaceConfig.cmake.in b/KWinDBusInterfaceConfig.cmake.in index e367c1f552..762a2ed202 100644 --- a/KWinDBusInterfaceConfig.cmake.in +++ b/KWinDBusInterfaceConfig.cmake.in @@ -1,4 +1,4 @@ -get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE) +@PACKAGE_INIT@ set(KWIN_INTERFACE "${PACKAGE_PREFIX_DIR}/@DBUS_INTERFACES_INSTALL_DIR@/org.kde.KWin.xml") set(KWIN_COMPOSITING_INTERFACE "${PACKAGE_PREFIX_DIR}/@DBUS_INTERFACES_INSTALL_DIR@/org.kde.kwin.Compositing.xml")