Fix CI errors on macOS & Windows

- Run the linter - Explicitly use cmake for installing olm
7 years ago · 7fc010fc4f
parent 8e9d210a2a
commit 7fc010fc4f
3 changed files with 9 additions and 8 deletions
--- 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)
--- 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"