diff options
| author | Carl Schwan <carl@carlschwan.eu> | 2021-01-27 17:54:27 +0100 |
|---|---|---|
| committer | Tobias Fella <fella@posteo.de> | 2021-12-01 21:34:52 +0100 |
| commit | 7ad805492f8b42a4bc854313695a912c89019957 (patch) | |
| tree | af5b89a8584104a7657b7e259e831ec33ceed020 | |
| parent | d44a7914c5f2ba231fdd9c830b1eace69c3383d0 (diff) | |
| download | libquotient-7ad805492f8b42a4bc854313695a912c89019957.tar.gz libquotient-7ad805492f8b42a4bc854313695a912c89019957.zip | |
Fix CI
| -rw-r--r-- | .github/workflows/ci.yml | 6 | ||||
| -rw-r--r-- | CMakeLists.txt | 14 |
2 files changed, 13 insertions, 7 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 47e55421..0b707236 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -106,6 +106,12 @@ jobs: with: arch: ${{ matrix.platform }} + - name: Install OpenSSL + if: contains(matrix.os, 'ubuntu') and matrix.e2ee + run: | + sudo apt-get install libssl-dev + echo "openssl version" >>$GITHUB_ENV + - name: Build and install olm if: matrix.e2ee run: | diff --git a/CMakeLists.txt b/CMakeLists.txt index 476b7d81..a04da04d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,14 +87,14 @@ 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(OpenSSL 1.1.0 REQUIRED) -set_package_properties(OpenSSL PROPERTIES - DESCRIPTION "Open source SSL and TLS implementation and cryptographic library" - URL "https://www.openssl.org/" - TYPE REQUIRED -) - if (${PROJECT_NAME}_ENABLE_E2EE) + find_package(OpenSSL 1.1.0 REQUIRED) + set_package_properties(OpenSSL PROPERTIES + DESCRIPTION "Open source SSL and TLS implementation and cryptographic library" + URL "https://www.openssl.org/" + TYPE REQUIRED + ) + if ((NOT DEFINED USE_INTREE_LIBQOLM OR USE_INTREE_LIBQOLM) AND EXISTS ${PROJECT_SOURCE_DIR}/3rdparty/libQtOlm/lib/utils.h) add_subdirectory(3rdparty/libQtOlm) |