Commit | Line | Data |
---|---|---|
e35b50ec HG |
1 | From bc018b4bc816a3b51deb9739bedbf8a2268d0684 Mon Sep 17 00:00:00 2001 |
2 | From: gnidorah <gnidorah@users.noreply.github.com> | |
3 | Date: Fri, 22 Dec 2017 17:36:03 +0300 | |
4 | Subject: [PATCH] Revert "Make Akonadi installation properly relocatable" | |
5 | ||
6 | This reverts commit b2bb55f13f2ac783f89cc414de8c39f62fa2096a. | |
7 | --- | |
8 | CMakeLists.txt | 3 --- | |
9 | KF5AkonadiConfig.cmake.in | 6 +++--- | |
10 | 2 files changed, 3 insertions(+), 6 deletions(-) | |
11 | ||
12 | Index: akonadi-19.08.0/CMakeLists.txt | |
13 | =================================================================== | |
14 | --- akonadi-19.08.0.orig/CMakeLists.txt | |
15 | +++ akonadi-19.08.0/CMakeLists.txt | |
16 | @@ -306,9 +306,6 @@ configure_package_config_file( | |
17 | "${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in" | |
18 | "${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake" | |
19 | INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} | |
20 | - PATH_VARS AKONADI_DBUS_INTERFACES_INSTALL_DIR | |
21 | - AKONADI_INCLUDE_DIR | |
22 | - KF5Akonadi_DATA_DIR | |
23 | ) | |
24 | ||
25 | install(FILES | |
26 | Index: akonadi-19.08.0/KF5AkonadiConfig.cmake.in | |
27 | =================================================================== | |
28 | --- akonadi-19.08.0.orig/KF5AkonadiConfig.cmake.in | |
29 | +++ akonadi-19.08.0/KF5AkonadiConfig.cmake.in | |
30 | @@ -26,8 +26,8 @@ if(BUILD_TESTING) | |
31 | find_dependency(Qt5Test "@QT_REQUIRED_VERSION@") | |
32 | endif() | |
33 | ||
34 | -set_and_check(AKONADI_DBUS_INTERFACES_DIR "@PACKAGE_AKONADI_DBUS_INTERFACES_INSTALL_DIR@") | |
35 | -set_and_check(AKONADI_INCLUDE_DIR "@PACKAGE_AKONADI_INCLUDE_DIR@") | |
36 | +set_and_check(AKONADI_DBUS_INTERFACES_DIR "@AKONADI_DBUS_INTERFACES_INSTALL_DIR@") | |
37 | +set_and_check(AKONADI_INCLUDE_DIR "@AKONADI_INCLUDE_DIR@") | |
38 | ||
39 | find_dependency(Boost "@Boost_MINIMUM_VERSION@") | |
40 | ||
41 | @@ -35,7 +35,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/KF5Ako | |
42 | include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiMacros.cmake) | |
43 | ||
44 | # The directory where akonadi-xml.xsd and kcfg2dbus.xsl are installed | |
45 | -set(KF5Akonadi_DATA_DIR "@PACKAGE_KF5Akonadi_DATA_DIR@") | |
46 | +set(KF5Akonadi_DATA_DIR "@KF5Akonadi_DATA_DIR@") | |
47 | ||
48 | #################################################################################### | |
49 | # CMAKE_AUTOMOC |