From 412e2cf19449e73aa7da729e9c5de6502687aade Mon Sep 17 00:00:00 2001 From: Black Hat Date: Fri, 2 Aug 2019 21:23:00 +0800 Subject: Update libQtOlm --- 3rdparty/libQtOlm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/libQtOlm b/3rdparty/libQtOlm index 8b7040c3..2c459a93 160000 --- a/3rdparty/libQtOlm +++ b/3rdparty/libQtOlm @@ -1 +1 @@ -Subproject commit 8b7040c3e1213563f41ead669fbb368322e4e361 +Subproject commit 2c459a9320130416d09b655821935a25708e9afc -- cgit v1.2.3 From e454cee984b97d178a8c1d272431d1749576fbf0 Mon Sep 17 00:00:00 2001 From: Black Hat Date: Thu, 26 Sep 2019 22:35:08 -0700 Subject: Fix appveyor build #1. --- .appveyor.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 89ad3e13..01e64e7c 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -20,11 +20,10 @@ before_build: - git submodule update --init --recursive - git clone https://gitlab.matrix.org/matrix-org/olm.git - cd olm -- cmake . -Bbuild -DBUILD_SHARED_LIBS=NO -DCMAKE_INSTALL_PREFIX="%DEPLOY_DIR%" +- cmake . -Bbuild -DBUILD_SHARED_LIBS=NO - 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%" +- cmake -G "NMake Makefiles JOM" -H. -Bbuild -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX="%DEPLOY_DIR%" -DOlm_DIR="./olm/build" build_script: - cmake --build build -- cgit v1.2.3 From f376c1d46897e149e5393b5ef84667c06ca7f673 Mon Sep 17 00:00:00 2001 From: Black Hat Date: Thu, 26 Sep 2019 23:02:52 -0700 Subject: Fix AppVeyor #2. --- .appveyor.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 01e64e7c..5abe2ec7 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -20,10 +20,11 @@ before_build: - git submodule update --init --recursive - git clone https://gitlab.matrix.org/matrix-org/olm.git - cd olm -- cmake . -Bbuild -DBUILD_SHARED_LIBS=NO +- cmake . -Bbuild -DBUILD_SHARED_LIBS=NO -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/build" +- 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 -- cgit v1.2.3 From c0591030c168e48bc65c43e8227d08060a66ee69 Mon Sep 17 00:00:00 2001 From: Black Hat Date: Thu, 26 Sep 2019 23:49:37 -0700 Subject: update libQtOlm --- 3rdparty/libQtOlm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/libQtOlm b/3rdparty/libQtOlm index 2c459a93..b315884f 160000 --- a/3rdparty/libQtOlm +++ b/3rdparty/libQtOlm @@ -1 +1 @@ -Subproject commit 2c459a9320130416d09b655821935a25708e9afc +Subproject commit b315884f12a59ec21f43a4feb16a06eed1556126 -- cgit v1.2.3 From 3995077cf3be380d4f06aeb6e5b753f39ff6cd15 Mon Sep 17 00:00:00 2001 From: Black Hat Date: Fri, 27 Sep 2019 00:03:54 -0700 Subject: try to fix AppVeyor --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 5abe2ec7..e066db30 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -20,7 +20,7 @@ before_build: - git submodule update --init --recursive - git clone https://gitlab.matrix.org/matrix-org/olm.git - cd olm -- cmake . -Bbuild -DBUILD_SHARED_LIBS=NO -DCMAKE_INSTALL_PREFIX=install +- cmake -G "NMake Makefiles JOM" -H. -Bbuild -DBUILD_SHARED_LIBS=NO -DCMAKE_INSTALL_PREFIX=install - cmake --build build - cmake --build build --target install - cd .. -- cgit v1.2.3 From 0442e2694e9e2f0f9d67026ff8ad2247f4ff50e5 Mon Sep 17 00:00:00 2001 From: Black Hat Date: Fri, 27 Sep 2019 00:26:57 -0700 Subject: Force C++17 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 951ef8c9..72bb7124 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.10) +set(CMAKE_CXX_STANDARD 17) if (POLICY CMP0092) cmake_policy(SET CMP0092 NEW) endif() @@ -225,7 +226,6 @@ set_target_properties(${PROJECT_NAME} PROPERTIES VERSION "${PROJECT_VERSION}" SOVERSION ${API_VERSION} INTERFACE_${PROJECT_NAME}_MAJOR_VERSION ${API_VERSION} - CXX_STANDARD 17 ) set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY COMPATIBLE_INTERFACE_STRING ${PROJECT_NAME}_MAJOR_VERSION) -- cgit v1.2.3 From 12ac9d60cc0d6cbedb5be2fcdb030683247c4e1d Mon Sep 17 00:00:00 2001 From: Black Hat Date: Fri, 27 Sep 2019 00:32:58 -0700 Subject: Olm relwithdebuginfo build --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index e066db30..26d4841d 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -20,7 +20,7 @@ before_build: - git submodule update --init --recursive - git clone https://gitlab.matrix.org/matrix-org/olm.git - cd olm -- cmake -G "NMake Makefiles JOM" -H. -Bbuild -DBUILD_SHARED_LIBS=NO -DCMAKE_INSTALL_PREFIX=install +- 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 .. -- cgit v1.2.3 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(-) 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(-) 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(-) 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(-) 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 From 71e7bbfbe774b422af178db57fe3e800a17f336d Mon Sep 17 00:00:00 2001 From: Black Hat Date: Sat, 28 Sep 2019 14:49:08 -0700 Subject: Enable QMake for AppVeyor --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 26d4841d..10eeafd0 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -29,7 +29,7 @@ before_build: 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 -- cgit v1.2.3 From 6870ee0d7a0df3427845de07ddae1e2fd5768bbb Mon Sep 17 00:00:00 2001 From: Black Hat Date: Sat, 28 Sep 2019 16:10:34 -0700 Subject: Set CXX_STANDARD by target property --- 3rdparty/libQtOlm | 2 +- CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/3rdparty/libQtOlm b/3rdparty/libQtOlm index b315884f..f449b2b3 160000 --- a/3rdparty/libQtOlm +++ b/3rdparty/libQtOlm @@ -1 +1 @@ -Subproject commit b315884f12a59ec21f43a4feb16a06eed1556126 +Subproject commit f449b2b3ed6cde97fe1494d48990947eb72c0852 diff --git a/CMakeLists.txt b/CMakeLists.txt index 72bb7124..951ef8c9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,4 @@ cmake_minimum_required(VERSION 3.10) -set(CMAKE_CXX_STANDARD 17) if (POLICY CMP0092) cmake_policy(SET CMP0092 NEW) endif() @@ -226,6 +225,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES VERSION "${PROJECT_VERSION}" SOVERSION ${API_VERSION} INTERFACE_${PROJECT_NAME}_MAJOR_VERSION ${API_VERSION} + CXX_STANDARD 17 ) set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY COMPATIBLE_INTERFACE_STRING ${PROJECT_NAME}_MAJOR_VERSION) -- cgit v1.2.3 From 36f51c5bb7f080a71a00472b9f0e453983c9afa9 Mon Sep 17 00:00:00 2001 From: Black Hat Date: Mon, 30 Sep 2019 21:39:21 -0700 Subject: Update libQtOlm --- 3rdparty/libQtOlm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/libQtOlm b/3rdparty/libQtOlm index f449b2b3..f2d8e235 160000 --- a/3rdparty/libQtOlm +++ b/3rdparty/libQtOlm @@ -1 +1 @@ -Subproject commit f449b2b3ed6cde97fe1494d48990947eb72c0852 +Subproject commit f2d8e235a4af0625fdedaaf727fef5d51293bf1b -- cgit v1.2.3