diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2020-03-29 11:48:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-29 11:48:04 +0200 |
| commit | c2493836c3b0f706e03ce71769761890d1314d7e (patch) | |
| tree | a7c58aa2fbc660e4aa97f0e37f736827fec714e5 /.travis.yml | |
| parent | cb09112c5b88f391019c05368ff6e8998722ba3c (diff) | |
| parent | 6f8f373efd5ae6909a481d17e6b20bca885ccd48 (diff) | |
| download | libquotient-c2493836c3b0f706e03ce71769761890d1314d7e.tar.gz libquotient-c2493836c3b0f706e03ce71769761890d1314d7e.zip | |
Merge pull request #396 from quotient-im/kitsune-fix-e2ee-building
Kitsune fix e2ee building
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 2449c003..74b2d0da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,7 +53,7 @@ install: - git clone https://gitlab.matrix.org/matrix-org/olm.git - pushd olm - _cmake_config -- _cmake_build # TODO: add --target install when the patch lands in olm +- _cmake_build --target install - popd - git clone https://github.com/quotient-im/matrix-doc.git - git clone --recursive https://github.com/KitsuneRal/gtad.git @@ -63,13 +63,13 @@ install: - popd before_script: -- _cmake_config -DMATRIX_DOC_PATH="matrix-doc" -DGTAD_PATH="gtad/gtad" -DOlm_DIR=olm/build $E2EE +- _cmake_config -DMATRIX_DOC_PATH="matrix-doc" -DGTAD_PATH="gtad/gtad" $E2EE - _cmake_build --target update-api script: - _cmake_build --target install # Build quotest with the installed libQuotient -- cmake $CMAKE_ARGS tests -Bbuild-test -DOlm_DIR=olm/build +- cmake $CMAKE_ARGS tests -Bbuild-test - cmake --build build-test --target all # Build with qmake - qmake quotest.pro "CONFIG += debug" "CONFIG -= app_bundle" "QMAKE_CC = $CC" "QMAKE_CXX = $CXX" "INCLUDEPATH += olm/include" "LIBS += -Lbuild/lib" "LIBS += -Lolm/build" |