Commit 7fcdb7fb authored by Volker Krause's avatar Volker Krause
Browse files

Set package prefix dependent variables before calling find_dependency()

find_dependency() changes the package prefix variable to whatever that is
for the package we look for. That's commonly the same, so this doesn't
matter. In the Flatpak build environment however Akonadi and its
dependencies are in different prefixes, causing this to break modules
depending on Akonadi when they need any of these variables.
parent 23ff0b8d
Pipeline #32951 passed with stage
in 32 minutes and 49 seconds
@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@")
# The directory where akonadi-xml.xsd and kcfg2dbus.xsl are installed
set(KF5Akonadi_DATA_DIR "@PACKAGE_KF5Akonadi_DATA_DIR@")
# set the directories
if(NOT AKONADI_INSTALL_DIR)
set(AKONADI_INSTALL_DIR "@CMAKE_INSTALL_PREFIX@")
......@@ -24,15 +30,9 @@ 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@")
find_dependency(Boost "@Boost_MINIMUM_VERSION@")
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@")
@PACKAGE_SETUP_AUTOMOC_VARIABLES@
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment