diff options
| author | Black Hat <bhat@encom.eu.org> | 2019-09-30 22:20:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-30 22:20:44 -0700 |
| commit | f24007465236a94b51a85a06f7f88192b9771ab0 (patch) | |
| tree | a4b294bb99d24fc60feb1978fa00c9087b430206 /.travis.yml | |
| parent | f71d16b56ab90e494d6a41c276210a4ce593987e (diff) | |
| parent | 36f51c5bb7f080a71a00472b9f0e453983c9afa9 (diff) | |
| download | libquotient-f24007465236a94b51a85a06f7f88192b9771ab0.tar.gz libquotient-f24007465236a94b51a85a06f7f88192b9771ab0.zip | |
Merge pull request #342 from quotient-im/bhat-libqtolm-update
Update libQtOlm
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 82b08945..68118423 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,8 +40,11 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then VALGRIND="valgrind $VALGRIND_OPTIONS"; fi install: -- pushd 3rdparty/libQtOlm - git clone https://gitlab.matrix.org/matrix-org/olm.git +- pushd olm +- cmake . -Bbuild -DBUILD_SHARED_LIBS=NO -DCMAKE_INSTALL_PREFIX=install +- cmake --build build +- cmake --build build --target install - popd - git clone https://github.com/quotient-im/matrix-doc.git - git clone --recursive https://github.com/KitsuneRal/gtad.git @@ -52,7 +55,7 @@ install: before_script: - mkdir build && pushd build -- cmake $USE_NINJA -DMATRIX_DOC_PATH="matrix-doc" -DGTAD_PATH="gtad/gtad" -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} -DCMAKE_INSTALL_PREFIX=../install .. +- cmake $USE_NINJA -DMATRIX_DOC_PATH="matrix-doc" -DGTAD_PATH="gtad/gtad" -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} -DCMAKE_INSTALL_PREFIX=../install -DOlm_DIR=../olm/install/lib/cmake/Olm .. - cmake --build . --target update-api - popd @@ -61,11 +64,11 @@ script: - cmake --build build --target install # Build qmc-example with the installed library - mkdir build-example && pushd build-example -- cmake -DCMAKE_PREFIX_PATH=../install ../examples +- cmake -DCMAKE_PREFIX_PATH=../install -DOlm_DIR=../olm/install/lib/cmake/Olm ../examples - cmake --build . --target all - popd # Build with qmake -- qmake qmc-example.pro "CONFIG += debug" "CONFIG -= app_bundle" "QMAKE_CC = $CC" "QMAKE_CXX = $CXX" "INCLUDEPATH += 3rdparty/libQtOlm/olm/include" "LIBS += -Lbuild/lib" +- qmake qmc-example.pro "CONFIG += debug" "CONFIG -= app_bundle" "QMAKE_CC = $CC" "QMAKE_CXX = $CXX" "INCLUDEPATH += olm/include" "LIBS += -Lbuild/lib" "LIBS += -Lolm/install/lib" - make all # Run the qmake-compiled qmc-example under valgrind - if [ "$QMC_TEST_USER" != "" ]; then LD_LIBRARY_PATH="build/lib" $VALGRIND ./qmc-example "$QMC_TEST_USER" "$QMC_TEST_PWD" qmc-example-travis '#qmc-test:matrix.org' "Travis CI job $TRAVIS_JOB_NUMBER"; fi |