From 9fbbe0c120f69acbf62d9a5adc0e052cba9d8021 Mon Sep 17 00:00:00 2001 From: vae Date: Mon, 10 May 2021 22:42:17 +0300 Subject: [PATCH] build: add signal-protocol-c dependency --- .gitmodules | 3 +++ CMakeLists.txt | 10 +++++++++- external/signal-protocol-c | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) create mode 160000 external/signal-protocol-c diff --git a/.gitmodules b/.gitmodules index bbe5364..c205907 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "external/qxmpp"] path = external/qxmpp url = https://github.com/qxmpp-project/qxmpp.git +[submodule "external/signal-protocol-c"] + path = external/signal-protocol-c + url = https://github.com/signalapp/libsignal-protocol-c.git diff --git a/CMakeLists.txt b/CMakeLists.txt index e88fdc8..7193a6f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,7 +64,8 @@ add_custom_target(translations ALL DEPENDS ${QM_FILES}) qt5_add_resources(RCC resources/resources.qrc) -option(SYSTEM_QXMPP "Use system qxmpp lib" ON) +option(SYSTEM_QXMPP "Use system qxmpp lib" ON) +option(SYSTEM_SIGNAL "Use system signal-protocol-c lib" OFF) option(WITH_KWALLET "Build KWallet support module" ON) option(WITH_KIO "Build KIO support module" ON) @@ -79,10 +80,16 @@ if (SYSTEM_QXMPP) endif() endif() +# TODO: detect if libsignal-protocol-c exists and set SYSTEM_SIGNAL? + if(NOT SYSTEM_QXMPP) add_subdirectory(external/qxmpp) endif() +if (NOT SYSTEM_SIGNAL) + add_subdirectory(external/signal-protocol-c) +endif() + if (WITH_KWALLET) find_package(KF5Wallet CONFIG) @@ -119,6 +126,7 @@ add_subdirectory(external/simpleCrypt) target_link_libraries(squawk squawkUI) target_link_libraries(squawk squawkCORE) target_link_libraries(squawk uuid) +target_link_libraries(squawk signal-protocol-c) diff --git a/external/signal-protocol-c b/external/signal-protocol-c new file mode 160000 index 0000000..3a83a4f --- /dev/null +++ b/external/signal-protocol-c @@ -0,0 +1 @@ +Subproject commit 3a83a4f4ed2302ff6e68ab569c88793b50c22d28