d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 19:08:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix CI errors on macOS & Windows

Browse source 
- Run the linter
- Explicitly use cmake for installing olm
This commit is contained in:
Konstantinos Sideris 2018-06-14 09:36:41 +03:00
parent 8e9d210a2a
commit 7fc010fc4f
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
deps/cmake/Olm.cmake vendored
View file

@ -1,5 +1,3 @@
set(OLM_PATCH ${CMAKE_CURRENT_SOURCE_DIR}/patches/olm-CMake-Support.patch)
ExternalProject_Add( ExternalProject_Add(
Olm Olm
@ -20,6 +18,9 @@ ExternalProject_Add(
${DEPS_BUILD_DIR}/olm ${DEPS_BUILD_DIR}/olm
BUILD_COMMAND ${CMAKE_COMMAND} BUILD_COMMAND ${CMAKE_COMMAND}
--build ${DEPS_BUILD_DIR}/olm --build ${DEPS_BUILD_DIR}/olm
--config Release) --config Release
INSTALL_COMMAND ${CMAKE_COMMAND}
--build ${DEPS_BUILD_DIR}/olm
--target install)
list(APPEND THIRD_PARTY_DEPS Olm) list(APPEND THIRD_PARTY_DEPS Olm)

8
src/CommunitiesList.cc
View file

@ -1,5 +1,5 @@
#include "Cache.h"
#include "CommunitiesList.h" #include "CommunitiesList.h"
#include "Cache.h"
#include "Logging.hpp" #include "Logging.hpp"
#include "MatrixClient.h" #include "MatrixClient.h"
@ -137,9 +137,9 @@ CommunitiesList::fetchCommunityAvatar(const QString &id, const QString &avatarUr
opts, [this, opts, id](const std::string &res, mtx::http::RequestErr err) { opts, [this, opts, id](const std::string &res, mtx::http::RequestErr err) {
if (err) { if (err) {
nhlog::net()->warn("failed to download avatar: {} - ({} {})", nhlog::net()->warn("failed to download avatar: {} - ({} {})",
opts.mxc_url, opts.mxc_url,
mtx::errors::to_string(err->matrix_error.errcode), mtx::errors::to_string(err->matrix_error.errcode),
err->matrix_error.error); err->matrix_error.error);
return; return;
} }

2
src/RegisterPage.cc
View file

@ -248,7 +248,7 @@ RegisterPage::onRegisterButtonClicked()
} }
nhlog::net()->warn("failed to register: status_code ({})", nhlog::net()->warn("failed to register: status_code ({})",
static_cast<int>(err->status_code)); static_cast<int>(err->status_code));
emit registerErrorCb(QString::fromStdString(err->matrix_error.error)); emit registerErrorCb(QString::fromStdString(err->matrix_error.error));
emit errorOccurred(); emit errorOccurred();