From 598d536d3cfb3f13f0343c67ceffab6125b5283b Mon Sep 17 00:00:00 2001 From: Johan Ouwerkerk Date: Mon, 25 May 2020 20:31:41 +0200 Subject: [PATCH] Make sure to install libsodium when built as an external project. --- src/secrets/CMakeLists.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/secrets/CMakeLists.txt b/src/secrets/CMakeLists.txt index b096063..bf53ec1 100644 --- a/src/secrets/CMakeLists.txt +++ b/src/secrets/CMakeLists.txt @@ -107,6 +107,14 @@ if (BUILD_EXTERNAL OR (NOT DEFINED BUILD_EXTERNAL AND ANDROID)) set_target_properties(sodium PROPERTIES IMPORTED_LOCATION "${INSTALL_DIR}/${sodium_LIBRARY_PATH}" INTERFACE_INCLUDE_DIRECTORIES "${INSTALL_DIR}/${sodium_INCLUDE_PATH}") add_dependencies(secrets_lib ext_libsodium) + + # + # Add an explicit install rule for libsodium: without it a make/ninja install will not pick it up. + # + # Note that the androiddeployqt tooling is documented to explicitly require a make/ninja install step: + # https://doc.qt.io/qt-5/deployment-android.html#package-template + # + install(FILES "${INSTALL_DIR}/${sodium_LIBRARY_PATH}" TYPE LIB) endif() target_link_libraries(secrets_lib Qt5::Core sodium base32_lib)