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 | |
| 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
| -rw-r--r-- | .appveyor.yml | 11 | ||||
| -rw-r--r-- | .travis.yml | 11 | ||||
| m--------- | 3rdparty/libQtOlm | 0 |
3 files changed, 14 insertions, 8 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index a9f67ee4..725adc8c 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -18,15 +18,18 @@ init: before_build: - git submodule update --init --recursive -- cd 3rdparty/libQtOlm - git clone https://gitlab.matrix.org/matrix-org/olm.git -- cd ../.. -- cmake -G "NMake Makefiles JOM" -H. -Bbuild -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX="%DEPLOY_DIR%" +- cd olm +- cmake -G "NMake Makefiles JOM" -H. -Bbuild -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=install +- cmake --build build +- cmake --build build --target install +- cd .. +- cmake -G "NMake Makefiles JOM" -H. -Bbuild -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX="%DEPLOY_DIR%" -DOlm_DIR="olm/install/lib/cmake/Olm" build_script: - cmake --build build # qmake uses olm just built by CMake - it can't build olm on its own. -- qmake "INCLUDEPATH += 3rdparty/libQtOlm/olm/include" "LIBS += -Lbuild" && jom +- qmake "INCLUDEPATH += olm/install/include" "LIBS += -Lbuild" "LIBS += -Lolm/install/lib" && jom #after_build: #- cmake --build build --target install 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 diff --git a/3rdparty/libQtOlm b/3rdparty/libQtOlm -Subproject f610197ba38ef87bbab8bcff1053bda684a5994 +Subproject f2d8e235a4af0625fdedaaf727fef5d51293bf1 |