mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-25 03:17:13 +00:00
52 lines
1.8 KiB
Diff
52 lines
1.8 KiB
Diff
From 7afe018382cf68b477b35f87b666424d62d19ef4 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Tuegel <ttuegel@mailbox.org>
|
|
Date: Mon, 13 Jul 2020 11:41:55 -0500
|
|
Subject: [PATCH 3/3] akonadi revert make relocatable
|
|
|
|
---
|
|
CMakeLists.txt | 3 ---
|
|
KF5AkonadiConfig.cmake.in | 6 +++---
|
|
2 files changed, 3 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index d927471..83a74c0 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -330,9 +330,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 421e1df..e3abf27 100644
|
|
--- a/KF5AkonadiConfig.cmake.in
|
|
+++ b/KF5AkonadiConfig.cmake.in
|
|
@@ -24,8 +24,8 @@ if(BUILD_TESTING)
|
|
find_dependency(Qt5Test "@QT_REQUIRED_VERSION@")
|
|
endif()
|
|
|
|
-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@")
|
|
|
|
@@ -33,7 +33,7 @@ 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@")
|
|
|
|
####################################################################################
|
|
# CMAKE_AUTOMOC
|
|
--
|
|
2.25.4
|
|
|