From 7fc010fc4f96d6a4cdec04558a7b053604e0cb39 Mon Sep 17 00:00:00 2001
From: Konstantinos Sideris <sideris.konstantin@gmail.com>
Date: Thu, 14 Jun 2018 09:36:41 +0300
Subject: [PATCH] Fix CI errors on macOS & Windows

- Run the linter
- Explicitly use cmake for installing olm
---
 deps/cmake/Olm.cmake   | 7 ++++---
 src/CommunitiesList.cc | 8 ++++----
 src/RegisterPage.cc    | 2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/deps/cmake/Olm.cmake b/deps/cmake/Olm.cmake
index c476f71d..eb4f53e3 100644
--- a/deps/cmake/Olm.cmake
+++ b/deps/cmake/Olm.cmake
@@ -1,5 +1,3 @@
-set(OLM_PATCH ${CMAKE_CURRENT_SOURCE_DIR}/patches/olm-CMake-Support.patch)
-
 ExternalProject_Add(
   Olm
 
@@ -20,6 +18,9 @@ ExternalProject_Add(
       ${DEPS_BUILD_DIR}/olm
   BUILD_COMMAND ${CMAKE_COMMAND}
     --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)
diff --git a/src/CommunitiesList.cc b/src/CommunitiesList.cc
index df4d6361..39e9a7fe 100644
--- a/src/CommunitiesList.cc
+++ b/src/CommunitiesList.cc
@@ -1,5 +1,5 @@
-#include "Cache.h"
 #include "CommunitiesList.h"
+#include "Cache.h"
 #include "Logging.hpp"
 #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) {
                   if (err) {
                           nhlog::net()->warn("failed to download avatar: {} - ({} {})",
-                                           opts.mxc_url,
-                                           mtx::errors::to_string(err->matrix_error.errcode),
-                                           err->matrix_error.error);
+                                             opts.mxc_url,
+                                             mtx::errors::to_string(err->matrix_error.errcode),
+                                             err->matrix_error.error);
                           return;
                   }
 
diff --git a/src/RegisterPage.cc b/src/RegisterPage.cc
index f56cd663..db52e101 100644
--- a/src/RegisterPage.cc
+++ b/src/RegisterPage.cc
@@ -248,7 +248,7 @@ RegisterPage::onRegisterButtonClicked()
                           }
 
                           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 errorOccurred();