From 0a9d95dfc9ef2c7e822257cc7b256cdd24d4a0d3 Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Mon, 4 Jun 2018 13:54:51 +0300 Subject: Include mtxclient in the build --- deps/cmake/MatrixClient.cmake | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 deps/cmake/MatrixClient.cmake (limited to 'deps/cmake/MatrixClient.cmake') diff --git a/deps/cmake/MatrixClient.cmake b/deps/cmake/MatrixClient.cmake new file mode 100644 index 00000000..7377f710 --- /dev/null +++ b/deps/cmake/MatrixClient.cmake @@ -0,0 +1,30 @@ +set(PLATFORM_FLAGS "") + +if(MSVC) + set(PLATFORM_FLAGS "-DCMAKE_GENERATOR_PLATFORM=x64") +endif() + +if(APPLE) + set(PLATFORM_FLAGS "-DOPENSSL_ROOT_DIR=/usr/local/opt/openssl") +endif() + +ExternalProject_Add( + MatrixClient + + DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/mtxclient + GIT_REPOSITORY ${MTXCLIENT_URL} + GIT_TAG ${MTXCLIENT_TAG} + + BUILD_IN_SOURCE 1 + SOURCE_DIR ${DEPS_BUILD_DIR}/mtxclient + CONFIGURE_COMMAND ${CMAKE_COMMAND} + -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR} + -DCMAKE_BUILD_TYPE=Release + -DBUILD_LIB_TESTS=OFF + -DBUILD_LIB_EXAMPLES=OFF + ${PLATFORM_FLAGS} + ${DEPS_BUILD_DIR}/mtxclient + BUILD_COMMAND + ${CMAKE_COMMAND} --build ${DEPS_BUILD_DIR}/mtxclient --config Release) + +list(APPEND THIRD_PARTY_DEPS MatrixClient) -- cgit 1.5.1 From b758cc4487837b93dacac9605a1668543a79a221 Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Fri, 15 Jun 2018 02:25:09 +0300 Subject: Pass down toolchain file on Windows --- deps/cmake/MatrixClient.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'deps/cmake/MatrixClient.cmake') diff --git a/deps/cmake/MatrixClient.cmake b/deps/cmake/MatrixClient.cmake index 7377f710..d8dd48c7 100644 --- a/deps/cmake/MatrixClient.cmake +++ b/deps/cmake/MatrixClient.cmake @@ -22,6 +22,7 @@ ExternalProject_Add( -DCMAKE_BUILD_TYPE=Release -DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF + -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} ${PLATFORM_FLAGS} ${DEPS_BUILD_DIR}/mtxclient BUILD_COMMAND -- cgit 1.5.1