From 55b148a0f78c1abef57c21b2a84d97cad32b2290 Mon Sep 17 00:00:00 2001 From: Marvin W Date: Tue, 21 Jan 2020 21:30:21 +0100 Subject: Use system provided libsignal-protocol-c by default You can still compile in tree by using --with-libsignal-in-tree flag --- plugins/signal-protocol/CMakeLists.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'plugins/signal-protocol') diff --git a/plugins/signal-protocol/CMakeLists.txt b/plugins/signal-protocol/CMakeLists.txt index 4c619c86..0ae84111 100644 --- a/plugins/signal-protocol/CMakeLists.txt +++ b/plugins/signal-protocol/CMakeLists.txt @@ -28,8 +28,11 @@ GENERATE_HEADER set(C_HEADERS_SRC "") set(C_HEADERS_TARGET "") -if((SHARED_SIGNAL_PROTOCOL) OR ($ENV{SHARED_SIGNAL_PROTOCOL})) - find_package(SignalProtocol REQUIRED) +if(NOT BUILD_LIBSIGNAL_IN_TREE) + # libsignal-protocol-c has a history of breaking compatibility on the patch level + # we'll have to check compatibility for every new release + # distro maintainers may update this dependency after compatibility tests + find_package(SignalProtocol 2.3.2 EXACT REQUIRED) else() add_subdirectory(libsignal-protocol-c EXCLUDE_FROM_ALL) set_property(TARGET curve25519 PROPERTY POSITION_INDEPENDENT_CODE ON) @@ -129,4 +132,4 @@ if(BUILD_TESTS) add_executable(signal-protocol-vala-test ${SIGNAL_TEST_VALA_C}) add_dependencies(signal-protocol-vala-test signal-protocol-vala) target_link_libraries(signal-protocol-vala-test signal-protocol-vala ${SIGNAL_PROTOCOL_PACKAGES}) -endif(BUILD_TESTS) \ No newline at end of file +endif(BUILD_TESTS) -- cgit v1.2.3-54-g00ecf