diff options
| author | Alexey Rusakov <Kitsune-Ral@users.sf.net> | 2021-06-13 18:15:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-13 18:15:36 +0200 |
| commit | d20aa002c0dcb2b40bbf7b48c5c995a5ed8138c1 (patch) | |
| tree | 713338c8bde5e6784bbdfcdee29cafc1f9eb36d4 /.appveyor.yml | |
| parent | 0571ba1fb1948a6cc050230a85201291ababbf04 (diff) | |
| parent | 083f62f58bc525d761969133e12a859de9b29648 (diff) | |
| download | libquotient-d20aa002c0dcb2b40bbf7b48c5c995a5ed8138c1.tar.gz libquotient-d20aa002c0dcb2b40bbf7b48c5c995a5ed8138c1.zip | |
Merge pull request #480 from quotient-im/kitsune-qt6-compat
Qt 6 support
Diffstat (limited to '.appveyor.yml')
| -rw-r--r-- | .appveyor.yml | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 69a58ba0..fa031ed8 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -9,16 +9,6 @@ environment: - QTDIR: C:\Qt\5.13\msvc2017_64 # Fresh Qt, 64-bit VCVARS: "vcvars64.bat" PLATFORM: - - QTDIR: C:\Qt\5.9\msvc2017_64 # Oldest supported Qt, 64-bit, E2EE - VCVARS: "vcvars64.bat" - QMAKE_E2EE_ARGS: '"DEFINES += Quotient_E2EE_ENABLED USE_INTREE_LIBQOLM" "INCLUDEPATH += olm/include" "LIBS += -Lbuild/olm"' - CMAKE_E2EE_ARGS: '-DQuotient_ENABLE_E2EE=ON -DOlm_DIR=build/olm' - PLATFORM: - - QTDIR: C:\Qt\5.13\msvc2017_64 # Fresh Qt, 64-bit, E2EE - VCVARS: "vcvars64.bat" - QMAKE_E2EE_ARGS: '"DEFINES += Quotient_E2EE_ENABLED USE_INTREE_LIBQOLM" "INCLUDEPATH += olm/include" "LIBS += -Lbuild/olm"' - CMAKE_E2EE_ARGS: '-DQuotient_ENABLE_E2EE=ON -DOlm_DIR=build/olm' - PLATFORM: init: - call "%QTDIR%\bin\qtenv2.bat" @@ -28,12 +18,9 @@ init: before_build: - git submodule update --init --recursive -- git clone https://gitlab.matrix.org/matrix-org/olm.git -- cmake %CMAKE_ARGS% -Holm -Bbuild/olm -- cmake --build build/olm build_script: -- cmake %CMAKE_ARGS% %CMAKE_E2EE_ARGS% -H. -Bbuild +- cmake %CMAKE_ARGS% -H. -Bbuild - cmake --build build #after_build: |