From b6d986177a555befe3448b03dbc543ff39d4a418 Mon Sep 17 00:00:00 2001 From: Xavier Del Campo Romero Date: Sat, 12 Aug 2023 03:35:30 +0200 Subject: Allow locally built libomemo-c --- libomemo-c/CMakeLists.txt | 18 ++++++++++++++++++ qxmpp/qxmpp | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/libomemo-c/CMakeLists.txt b/libomemo-c/CMakeLists.txt index 20e3836..b57e494 100644 --- a/libomemo-c/CMakeLists.txt +++ b/libomemo-c/CMakeLists.txt @@ -1 +1,19 @@ add_subdirectory(libomemo-c) +target_include_directories(omemo-c PUBLIC + $ + $) +export(TARGETS omemo-c FILE Findomemo-c.cmake) + +install( + TARGETS omemo-c + EXPORT OmemoCTargets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} +) + +install( + EXPORT OmemoCTargets + DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/libomemo-c" + FILE Findomemo-c.cmake +) diff --git a/qxmpp/qxmpp b/qxmpp/qxmpp index 6972498..2ec7614 160000 --- a/qxmpp/qxmpp +++ b/qxmpp/qxmpp @@ -1 +1 @@ -Subproject commit 697249844a4bdf70165e97f77e71cbabbfee5933 +Subproject commit 2ec7614ca23fb36a6de7077d8e34e2004c070606 -- cgit v1.2.3