From 0b28322a814b8a8b83a765c74fb85b1fece38b8a Mon Sep 17 00:00:00 2001
From: Konstantinos Sideris <sideris.konstantin@gmail.com>
Date: Sun, 11 Mar 2018 21:15:06 +0200
Subject: [PATCH] Add libolm as dependency
---
CMakeLists.txt | 14 ++++++++++----
cmake/Olm.cmake | 24 ++++++++++++++++++++++++
2 files changed, 34 insertions(+), 4 deletions(-)
create mode 100644 cmake/Olm.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3dc6276ac..488ca9e2f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,7 @@ project(matrix_client CXX)
option(BUILD_LIB_TESTS "Build tests" ON)
option(BUILD_LIB_EXAMPLES "Build examples" ON)
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
@@ -53,7 +54,7 @@ find_package(Boost 1.66 COMPONENTS system random thread)
if(NOT Boost_FOUND)
message(STATUS "Fetching and building Boost 1.66")
- include(${CMAKE_SOURCE_DIR}/cmake/Boost.cmake)
+ include(Boost)
endif()
include_directories(${Boost_INCLUDE_DIRS})
@@ -61,15 +62,20 @@ include_directories(${Boost_INCLUDE_DIRS})
#
# matrix-structs
#
-include(${CMAKE_SOURCE_DIR}/cmake/MatrixStructs.cmake)
+include(MatrixStructs)
+
+#
+# libolm
+#
+include(Olm)
include_directories(src)
include_directories(${MATRIX_STRUCTS_INCLUDE_DIRS})
set(SRC src/client.cpp src/utils.cpp)
add_library(matrix_client ${SRC})
-add_dependencies(matrix_client MatrixStructs)
-target_link_libraries(matrix_client matrix_structs ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES})
+add_dependencies(matrix_client MatrixStructs Olm)
+target_link_libraries(matrix_client matrix_structs olm ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES})
if(NOT Boost_FOUND)
add_dependencies(matrix_client Boost)
diff --git a/cmake/Olm.cmake b/cmake/Olm.cmake
new file mode 100644
index 000000000..a17206ef4
--- /dev/null
+++ b/cmake/Olm.cmake
@@ -0,0 +1,24 @@
+include(ExternalProject)
+
+#
+# Build & install olm.
+#
+
+set(THIRD_PARTY_ROOT ${CMAKE_SOURCE_DIR}/.third-party)
+set(OLM_ROOT ${THIRD_PARTY_ROOT}/olm)
+
+ExternalProject_Add(
+ Olm
+
+ GIT_REPOSITORY https://git.matrix.org/git/olm.git
+ GIT_TAG 3f5b9dd6d72540a66da90b382a2eda088af63da0
+
+ BUILD_IN_SOURCE 1
+ SOURCE_DIR ${OLM_ROOT}
+ CONFIGURE_COMMAND ""
+ BUILD_COMMAND make static
+ INSTALL_COMMAND ""
+)
+
+include_directories(SYSTEM ${OLM_ROOT}/include ${OLM_ROOT}/include/olm)
+link_directories(${OLM_ROOT}/build)
--
GitLab