summary refs log tree commit diff
path: root/deps
diff options
context:
space:
mode:
authorKonstantinos Sideris <sideris.konstantin@gmail.com>2018-06-14 09:36:41 +0300
committerKonstantinos Sideris <sideris.konstantin@gmail.com>2018-06-14 09:36:41 +0300
commit7fc010fc4f96d6a4cdec04558a7b053604e0cb39 (patch)
tree2f1d3a39714774d8c4cffd83de274e4761ff3837 /deps
parentRename the log namespace to avoid symbol clash with the math function (diff)
downloadnheko-7fc010fc4f96d6a4cdec04558a7b053604e0cb39.tar.xz
Fix CI errors on macOS & Windows
- Run the linter
- Explicitly use cmake for installing olm
Diffstat (limited to 'deps')
-rw-r--r--deps/cmake/Olm.cmake7
1 files changed, 4 insertions, 3 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)