From e6ede4f43c8a9325900838009fb8a60f164faa33 Mon Sep 17 00:00:00 2001 From: Black Hat Date: Fri, 27 Sep 2019 00:49:49 -0700 Subject: Fix Travis CI. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index fe6ca441..b36fbe7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,7 +42,7 @@ before_install: install: - git clone https://gitlab.matrix.org/matrix-org/olm.git - pushd olm -- cmake . -Bbuild -DBUILD_SHARED_LIBS=NO -DCMAKE_INSTALL_PREFIX=../install +- cmake . -Bbuild -DBUILD_SHARED_LIBS=NO -DCMAKE_INSTALL_PREFIX=install - cmake --build build - cmake --build build --target install - popd @@ -55,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 -- cgit v1.2.3 From 97e2ac6201c14aaaf2a2ea9af60c904b197e067d Mon Sep 17 00:00:00 2001 From: Black Hat Date: Fri, 27 Sep 2019 11:21:07 -0700 Subject: Fix travis ci --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index b36fbe7d..7a9a6599 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,7 +64,7 @@ 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 -- cgit v1.2.3 From a49461cf05ae31e6cf560ab960212e2310ab0f52 Mon Sep 17 00:00:00 2001 From: Black Hat Date: Fri, 27 Sep 2019 12:05:16 -0700 Subject: Fix Travis CI QMake --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 7a9a6599..e4ceae90 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,7 +68,7 @@ script: - 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" - 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 -- cgit v1.2.3 From ccf4f267f294c1e731fecdada9470ed84ad78ecf Mon Sep 17 00:00:00 2001 From: Black Hat Date: Fri, 27 Sep 2019 12:27:18 -0700 Subject: Fix QMake travis ci --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index e4ceae90..68118423 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,7 +68,7 @@ script: - cmake --build . --target all - popd # Build with qmake -- qmake qmc-example.pro "CONFIG += debug" "CONFIG -= app_bundle" "QMAKE_CC = $CC" "QMAKE_CXX = $CXX" "INCLUDEPATH += 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 -- cgit v1.2.3