diff options
| author | Alexey Rusakov <Kitsune-Ral@users.sf.net> | 2022-05-30 11:30:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-30 11:30:26 +0200 |
| commit | e31d1bfcc9255f2e6ad4dbd54bd49429939e8e78 (patch) | |
| tree | 0ff2b7cda3c4dae7bed3e76265e96960a7ac4b51 /CMakeLists.txt | |
| parent | 8a868988be0c5ce4ea8a22f4a6f8c7e8b2e42037 (diff) | |
| parent | 9c436d314f6b082287fb129ea1fcf960313e5c27 (diff) | |
| download | libquotient-e31d1bfcc9255f2e6ad4dbd54bd49429939e8e78.tar.gz libquotient-e31d1bfcc9255f2e6ad4dbd54bd49429939e8e78.zip | |
Merge pull request #555 from TobiasFella/accountskeychain
Load and store accounts in the keychain
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 635efd90..4c1a2777 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,6 +87,8 @@ find_package(${Qt} ${QtMinVersion} REQUIRED Core Network Gui Test ${QtExtraModul get_filename_component(Qt_Prefix "${${Qt}_DIR}/../../../.." ABSOLUTE) message(STATUS "Using Qt ${${Qt}_VERSION} at ${Qt_Prefix}") +find_package(${Qt}Keychain REQUIRED) + if (${PROJECT_NAME}_ENABLE_E2EE) find_package(${Qt} ${QtMinVersion} REQUIRED Sql) find_package(Olm 3.1.3 REQUIRED) @@ -108,7 +110,6 @@ if (${PROJECT_NAME}_ENABLE_E2EE) if (OpenSSL_FOUND) message(STATUS "Using OpenSSL ${OpenSSL_VERSION} at ${OpenSSL_DIR}") endif() - find_package(${Qt}Keychain REQUIRED) endif() @@ -309,14 +310,14 @@ if (${PROJECT_NAME}_ENABLE_E2EE) target_link_libraries(${PROJECT_NAME} Olm::Olm OpenSSL::Crypto OpenSSL::SSL - ${Qt}::Sql - ${QTKEYCHAIN_LIBRARIES}) + ${Qt}::Sql) set(FIND_DEPS "find_dependency(Olm) find_dependency(OpenSSL) find_dependency(${Qt}Sql)") # For QuotientConfig.cmake.in endif() -target_link_libraries(${PROJECT_NAME} ${Qt}::Core ${Qt}::Network ${Qt}::Gui) +target_include_directories(${PROJECT_NAME} PRIVATE ${QTKEYCHAIN_INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} ${Qt}::Core ${Qt}::Network ${Qt}::Gui ${QTKEYCHAIN_LIBRARIES}) if (Qt STREQUAL Qt5) # See #483 target_link_libraries(${PROJECT_NAME} ${Qt}::Multimedia) |