50 lines
1.9 KiB
Diff
50 lines
1.9 KiB
Diff
|
From bc018b4bc816a3b51deb9739bedbf8a2268d0684 Mon Sep 17 00:00:00 2001
|
||
|
|
From: gnidorah <gnidorah@users.noreply.github.com>
|
||
|
|
Date: Fri, 22 Dec 2017 17:36:03 +0300
|
||
|
|
Subject: [PATCH] Revert "Make Akonadi installation properly relocatable"
|
||
|
|
|
||
|
|
This reverts commit b2bb55f13f2ac783f89cc414de8c39f62fa2096a.
|
||
|
|
---
|
||
|
|
CMakeLists.txt | 3 ---
|
||
|
|
KF5AkonadiConfig.cmake.in | 6 +++---
|
||
|
|
2 files changed, 3 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index 9788bea94..15bad00fd 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -285,9 +285,6 @@ configure_package_config_file(
|
||
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in"
|
||
|
|
"${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake"
|
||
|
|
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
|
||
|
|
- PATH_VARS AKONADI_DBUS_INTERFACES_INSTALL_DIR
|
||
|
|
- AKONADI_INCLUDE_DIR
|
||
|
|
- KF5Akonadi_DATA_DIR
|
||
|
|
)
|
||
|
|
|
||
|
|
install(FILES
|
||
|
|
diff --git a/KF5AkonadiConfig.cmake.in b/KF5AkonadiConfig.cmake.in
|
||
|
|
index 75abede50..10f039376 100644
|
||
|
|
--- a/KF5AkonadiConfig.cmake.in
|
||
|
|
+++ b/KF5AkonadiConfig.cmake.in
|
||
|
|
@@ -13,8 +13,8 @@ find_dependency(KF5ConfigWidgets "@KF5_VERSION@")
|
||
|
|
find_dependency(Qt5DBus "@QT_REQUIRED_VERSION@")
|
||
|
|
find_dependency(Qt5Network "@QT_REQUIRED_VERSION@")
|
||
|
|
|
||
|
|
-set_and_check(AKONADI_DBUS_INTERFACES_DIR "@PACKAGE_AKONADI_DBUS_INTERFACES_INSTALL_DIR@")
|
||
|
|
-set_and_check(AKONADI_INCLUDE_DIR "@PACKAGE_AKONADI_INCLUDE_DIR@")
|
||
|
|
+set_and_check(AKONADI_DBUS_INTERFACES_DIR "@AKONADI_DBUS_INTERFACES_INSTALL_DIR@")
|
||
|
|
+set_and_check(AKONADI_INCLUDE_DIR "@AKONADI_INCLUDE_DIR@")
|
||
|
|
|
||
|
|
find_dependency(Boost "@Boost_MINIMUM_VERSION@")
|
||
|
|
|
||
|
|
@@ -22,4 +22,4 @@ include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiTargets.cmake)
|
||
|
|
include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiMacros.cmake)
|
||
|
|
|
||
|
|
# The directory where akonadi-xml.xsd and kcfg2dbus.xsl are installed
|
||
|
|
-set(KF5Akonadi_DATA_DIR "@PACKAGE_KF5Akonadi_DATA_DIR@")
|
||
|
|
+set(KF5Akonadi_DATA_DIR "@KF5Akonadi_DATA_DIR@")
|
||
|
|
--
|
||
|
|
2.15.1
|
||
|
|
|