diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2bc95dcdb..e60945121 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ include: - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/reuse-lint.yml -# - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android-qt6.yml + - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android-qt6.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml # - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows-qt6.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd-qt6.yml diff --git a/CMakeLists.txt b/CMakeLists.txt index 84ae58f50..cf2c98fd2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -101,7 +101,8 @@ set_package_properties(QuotientQt6 PROPERTIES PURPOSE "Talk with matrix server" ) -if (NOT TARGET Olm::Olm) +# The android part is just for CI. We do NOT support any builds without E2EE +if (NOT TARGET Olm::Olm AND NOT ANDROID) message(FATAL_ERROR "NeoChat requires Quotient with the E2EE feature enabled") endif()