From 697249844a4bdf70165e97f77e71cbabbfee5933 Mon Sep 17 00:00:00 2001
From: Xavier Del Campo Romero <xavi.dcr@tutanota.com>
Date: Tue, 20 Jun 2023 12:33:26 +0200
Subject: omemo/CMakeLists.txt: allow using QXmpp from the build interface

---
 src/omemo/CMakeLists.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/omemo/CMakeLists.txt b/src/omemo/CMakeLists.txt
index 9086ec64..d4537904 100644
--- a/src/omemo/CMakeLists.txt
+++ b/src/omemo/CMakeLists.txt
@@ -5,7 +5,7 @@
 include(CMakePackageConfigHelpers)
 
 set(OMEMO_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${QXMPPOMEMO_TARGET}")
-set(OMEMO_HEADER_DIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}/${QXMPP_TARGET}/Omemo")
+set(OMEMO_HEADER_DIR .)
 set(OMEMO_INSTALL_HEADER_FILES
     QXmppOmemoManager.h
     QXmppOmemoMemoryStorage.h
@@ -36,7 +36,8 @@ target_link_libraries(${QXMPPOMEMO_TARGET}
 )
 target_include_directories(${QXMPPOMEMO_TARGET}
     PUBLIC
-    ${OMEMO_HEADER_DIR}
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>
+        $<INSTALL_INTERFACE:"${CMAKE_INSTALL_FULL_INCLUDEDIR}/${QXMPP_TARGET}/Omemo">
     PRIVATE
     ${CMAKE_CURRENT_LIST_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
@@ -47,7 +48,7 @@ generate_export_header(${QXMPPOMEMO_TARGET} BASE_NAME qxmppomemo)
 
 install(
     FILES ${OMEMO_INSTALL_HEADER_FILES} ${CMAKE_CURRENT_BINARY_DIR}/qxmppomemo_export.h
-    DESTINATION ${OMEMO_HEADER_DIR}
+    DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/${QXMPP_TARGET}/Omemo"
 )
 
 set_target_properties(${QXMPPOMEMO_TARGET} PROPERTIES
-- 
cgit v1.2.3