46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
|
From 4b90a0bd4411a66bbe6ecf85ce89a60a58bee969 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thomas Tuegel <ttuegel@mailbox.org>
|
||
|
|
Date: Sun, 25 Apr 2021 08:01:21 -0500
|
||
|
|
Subject: [PATCH 3/3] akonadi revert make relocatable
|
||
|
|
|
||
|
|
---
|
||
|
|
CMakeLists.txt | 3 ---
|
||
|
|
KPimAkonadiConfig.cmake.in | 6 +++---
|
||
|
|
2 files changed, 3 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index 4e8cc81..63161b7 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -368,9 +368,6 @@ configure_package_config_file(
|
||
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/KPimAkonadiConfig.cmake.in"
|
||
|
|
"${CMAKE_CURRENT_BINARY_DIR}/KPimAkonadiConfig.cmake"
|
||
|
|
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
|
||
|
|
- PATH_VARS AKONADI_DBUS_INTERFACES_INSTALL_DIR
|
||
|
|
- AKONADI_INCLUDE_DIR
|
||
|
|
- KF5Akonadi_DATA_DIR
|
||
|
|
)
|
||
|
|
|
||
|
|
install(FILES
|
||
|
|
diff --git a/KPimAkonadiConfig.cmake.in b/KPimAkonadiConfig.cmake.in
|
||
|
|
index bcf7320..1574319 100644
|
||
|
|
--- a/KPimAkonadiConfig.cmake.in
|
||
|
|
+++ b/KPimAkonadiConfig.cmake.in
|
||
|
|
@@ -1,10 +1,10 @@
|
||
|
|
@PACKAGE_INIT@
|
||
|
|
|
||
|
|
-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@")
|
||
|
|
|
||
|
|
# 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@")
|
||
|
|
|
||
|
|
# set the directories
|
||
|
|
if(NOT AKONADI_INSTALL_DIR)
|
||
|
|
--
|
||
|
|
2.31.1
|
||
|
|
|