diff options
| author | Alexey Rusakov <Kitsune-Ral@users.sf.net> | 2021-07-10 20:43:09 +0200 |
|---|---|---|
| committer | Alexey Rusakov <Kitsune-Ral@users.sf.net> | 2021-07-10 20:43:09 +0200 |
| commit | 90a5ad87ac455d1d1eb6401824312b28a318fddb (patch) | |
| tree | d006483f6c5c91b042f566fe210bb9f6732df55e /.appveyor.yml | |
| parent | b04ff258cc60687fadf0129eba0be2071f0da00c (diff) | |
| parent | 32d6616677bc4a94554527110e8d227aaf3aea34 (diff) | |
| download | libquotient-90a5ad87ac455d1d1eb6401824312b28a318fddb.tar.gz libquotient-90a5ad87ac455d1d1eb6401824312b28a318fddb.zip | |
Merge branch '0.6.x' into kitsune-fix-read-receipts-and-markers-0.6
Diffstat (limited to '.appveyor.yml')
| -rw-r--r-- | .appveyor.yml | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 764d56d6..e0bf14a7 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -3,22 +3,15 @@ image: Visual Studio 2017 environment: CMAKE_ARGS: '-G "NMake Makefiles JOM" -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo' matrix: + - QTDIR: C:\Qt\5.9\msvc2017_64 # Oldest supported Qt, 64-bit + VCVARS: "vcvars64.bat" + PLATFORM: - QTDIR: C:\Qt\5.13\msvc2017 # Fresh Qt, 32-bit VCVARS: "vcvars32.bat" PLATFORM: x86 - 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,15 +21,10 @@ 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 -# qmake uses olm just built by CMake - it can't build olm on its own. -- qmake -Wall quotest.pro -- %QMAKE_E2EE_ARGS% && jom #after_build: #- cmake --build build --target install |