From b5f9e1bd20f985c18ec630fa496510018547b728 Mon Sep 17 00:00:00 2001 From: Alexey Andreyev Date: Wed, 26 Jun 2019 16:36:45 +0300 Subject: Change libQtOlm location. Fix .travis.yml and .appveyor.yml --- 3rdparty/libQtOlm | 1 + 1 file changed, 1 insertion(+) create mode 160000 3rdparty/libQtOlm (limited to '3rdparty/libQtOlm') diff --git a/3rdparty/libQtOlm b/3rdparty/libQtOlm new file mode 160000 index 00000000..f610197b --- /dev/null +++ b/3rdparty/libQtOlm @@ -0,0 +1 @@ +Subproject commit f610197ba38ef87bbab8bcff1053bda684a5994a -- cgit v1.2.3 From bc8d6b7addc07b6882e86ad02ddd0261ce544101 Mon Sep 17 00:00:00 2001 From: Black Hat Date: Thu, 18 Jul 2019 12:42:09 +0800 Subject: libQtOlm: Upstream fix of qmake not able to find libOlm on macOS. --- 3rdparty/libQtOlm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '3rdparty/libQtOlm') diff --git a/3rdparty/libQtOlm b/3rdparty/libQtOlm index f610197b..8b7040c3 160000 --- a/3rdparty/libQtOlm +++ b/3rdparty/libQtOlm @@ -1 +1 @@ -Subproject commit f610197ba38ef87bbab8bcff1053bda684a5994a +Subproject commit 8b7040c3e1213563f41ead669fbb368322e4e361 -- cgit v1.2.3 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(-) (limited to '3rdparty/libQtOlm') 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 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(-) (limited to '3rdparty/libQtOlm') 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 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(-) (limited to '3rdparty/libQtOlm') 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(-) (limited to '3rdparty/libQtOlm') 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 From ab9996fc62767d61da779d869e68bfc966ffce8f Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Mon, 6 Apr 2020 20:53:26 +0200 Subject: CMakeLists: install header files to a subdirectory This is a Quotient part of #328 fix; QtOlm part is pending. --- 3rdparty/libQtOlm | 2 +- CMakeLists.txt | 43 +++++++++++++++++++++++++------------------ lib/jobs/basejob.cpp | 2 +- 3 files changed, 27 insertions(+), 20 deletions(-) (limited to '3rdparty/libQtOlm') diff --git a/3rdparty/libQtOlm b/3rdparty/libQtOlm index f2d8e235..dc81e9f1 160000 --- a/3rdparty/libQtOlm +++ b/3rdparty/libQtOlm @@ -1 +1 @@ -Subproject commit f2d8e235a4af0625fdedaaf727fef5d51293bf1b +Subproject commit dc81e9f19021821eb07d43db555e5ae1ac3cf5b1 diff --git a/CMakeLists.txt b/CMakeLists.txt index 46ce64c5..6fac4672 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,9 +11,25 @@ option(${PROJECT_NAME}_INSTALL_TESTS "install quotest (former qmc-example) appli option(${PROJECT_NAME}_ENABLE_E2EE "end-to-end encryption (E2EE) support" OFF) include(CheckCXXCompilerFlag) -if (NOT WIN32) +if (WIN32) + if (NOT CMAKE_INSTALL_LIBDIR) + set(CMAKE_INSTALL_LIBDIR ".") + endif () + + if (NOT CMAKE_INSTALL_BINDIR) + set(CMAKE_INSTALL_BINDIR ".") + endif () + + if (NOT CMAKE_INSTALL_INCLUDEDIR) + set(CMAKE_INSTALL_INCLUDEDIR "include") + endif () +else() include(GNUInstallDirs) -endif(NOT WIN32) + set(INCLUDEDIR_INIT ${PROJECT_NAME}) +endif(WIN32) +set(${PROJECT_NAME}_INSTALL_INCLUDEDIR + "${CMAKE_INSTALL_INCLUDEDIR}/${INCLUDEDIR_INIT}" CACHE PATH + "directory to install ${PROJECT_NAME} include files to") # Instruct CMake to run moc automatically when needed. set(CMAKE_AUTOMOC ON) @@ -27,18 +43,6 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) "MinSizeRel" "RelWithDebInfo") endif() -if (NOT CMAKE_INSTALL_LIBDIR) - set(CMAKE_INSTALL_LIBDIR ".") -endif() - -if (NOT CMAKE_INSTALL_BINDIR) - set(CMAKE_INSTALL_BINDIR ".") -endif() - -if (NOT CMAKE_INSTALL_INCLUDEDIR) - set(CMAKE_INSTALL_INCLUDEDIR "include") -endif() - if (MSVC) add_compile_options(/EHsc /W4 /wd4100 /wd4127 /wd4242 /wd4244 /wd4245 /wd4267 /wd4365 /wd4456 /wd4459 @@ -67,6 +71,8 @@ if (${PROJECT_NAME}_ENABLE_E2EE) endif () endif () if (NOT USE_INTREE_LIBQOLM) + set(SAVED_CMAKE_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_INCLUDEDIR}) + set(CMAKE_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_INCLUDEDIR}) find_package(QtOlm 0.1.0 REQUIRED) if (NOT QtOlm_FOUND) message( WARNING "libQtOlm not found; configuration will most likely fail.") @@ -76,7 +82,7 @@ if (${PROJECT_NAME}_ENABLE_E2EE) endif () endif () else () - message( WARNING "End-to-end encryption (E2EE) support is turned off.") + message( STATUS "End-to-end encryption (E2EE) support is turned off.") endif () if (GTAD_PATH) @@ -102,6 +108,7 @@ if (CMAKE_BUILD_TYPE) endif(CMAKE_BUILD_TYPE) message( STATUS "Using compiler: ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}" ) message( STATUS "Install Prefix: ${CMAKE_INSTALL_PREFIX}" ) +message( STATUS " Header files will be installed to ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDEDIR}" ) message( STATUS "Using Qt ${Qt5_VERSION} at ${Qt5_Prefix}" ) if (ABS_API_DEF_PATH AND ABS_GTAD_PATH) message( STATUS "Generating API stubs enabled (use --target update-api)" ) @@ -248,7 +255,7 @@ target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_17) target_include_directories(${PROJECT_NAME} PUBLIC $ - $ + $ ) if (${PROJECT_NAME}_ENABLE_E2EE) target_link_libraries(${PROJECT_NAME} QtOlm) @@ -267,9 +274,9 @@ configure_file(${PROJECT_NAME}.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME} install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + INCLUDES DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDEDIR} ) -install(DIRECTORY lib/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} +install(DIRECTORY lib/ DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDEDIR} FILES_MATCHING PATTERN "*.h") include(CMakePackageConfigHelpers) diff --git a/lib/jobs/basejob.cpp b/lib/jobs/basejob.cpp index 65668521..4ede073f 100644 --- a/lib/jobs/basejob.cpp +++ b/lib/jobs/basejob.cpp @@ -232,7 +232,7 @@ void BaseJob::Private::sendRequest() req.setAttribute(QNetworkRequest::BackgroundRequestAttribute, inBackground); req.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); req.setMaximumRedirectsAllowed(10); - req.setAttribute(QNetworkRequest::HttpPipeliningAllowedAttribute, true); +// req.setAttribute(QNetworkRequest::HttpPipeliningAllowedAttribute, true); req.setAttribute(QNetworkRequest::HTTP2AllowedAttribute, true); Q_ASSERT(req.url().isValid()); for (auto it = requestHeaders.cbegin(); it != requestHeaders.cend(); ++it) -- cgit v1.2.3 From a8572345e7a30c96b8ede47e95af65ff2cdef86c Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Mon, 6 Apr 2020 21:20:32 +0200 Subject: Revert changes accidentally sneaked in with the previous commit --- 3rdparty/libQtOlm | 2 +- lib/jobs/basejob.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to '3rdparty/libQtOlm') diff --git a/3rdparty/libQtOlm b/3rdparty/libQtOlm index dc81e9f1..f2d8e235 160000 --- a/3rdparty/libQtOlm +++ b/3rdparty/libQtOlm @@ -1 +1 @@ -Subproject commit dc81e9f19021821eb07d43db555e5ae1ac3cf5b1 +Subproject commit f2d8e235a4af0625fdedaaf727fef5d51293bf1b diff --git a/lib/jobs/basejob.cpp b/lib/jobs/basejob.cpp index 4ede073f..65668521 100644 --- a/lib/jobs/basejob.cpp +++ b/lib/jobs/basejob.cpp @@ -232,7 +232,7 @@ void BaseJob::Private::sendRequest() req.setAttribute(QNetworkRequest::BackgroundRequestAttribute, inBackground); req.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); req.setMaximumRedirectsAllowed(10); -// req.setAttribute(QNetworkRequest::HttpPipeliningAllowedAttribute, true); + req.setAttribute(QNetworkRequest::HttpPipeliningAllowedAttribute, true); req.setAttribute(QNetworkRequest::HTTP2AllowedAttribute, true); Q_ASSERT(req.url().isValid()); for (auto it = requestHeaders.cbegin(); it != requestHeaders.cend(); ++it) -- cgit v1.2.3