diff options
| -rw-r--r-- | .appveyor.yml | 11 | ||||
| -rw-r--r-- | .travis.yml | 5 | ||||
| m--------- | 3rdparty/libQtOlm | 0 |
3 files changed, 11 insertions, 5 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 1dbdf237..89ad3e13 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 . -Bbuild -DBUILD_SHARED_LIBS=NO -DCMAKE_INSTALL_PREFIX="%DEPLOY_DIR%" +- 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="%DEPLOY_DIR%" 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 += 3rdparty/libQtOlm/olm/include" "LIBS += -Lbuild" && jom #after_build: #- cmake --build build --target install diff --git a/.travis.yml b/.travis.yml index 82b08945..fe6ca441 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 diff --git a/3rdparty/libQtOlm b/3rdparty/libQtOlm -Subproject f610197ba38ef87bbab8bcff1053bda684a5994 +Subproject 2c459a9320130416d09b655821935a25708e9af |