d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 11:00:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use archives instead of repos to fetch dependencies

Browse source
This commit is contained in:
Konstantinos Sideris 2018-08-08 14:15:14 +03:00
parent d0ecbb79fb
commit f955ec762c
7 changed files with 35 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -231,7 +231,7 @@ find_package(OpenSSL REQUIRED)
find_package(MatrixStructs 0.1.0 REQUIRED) find_package(MatrixStructs 0.1.0 REQUIRED)
find_package(MatrixClient 0.1.0 REQUIRED) find_package(MatrixClient 0.1.0 REQUIRED)
find_package(Olm 2 REQUIRED) find_package(Olm 2 REQUIRED)
find_package(spdlog 0.16.0 CONFIG REQUIRED) find_package(spdlog 1.0.0 CONFIG REQUIRED)
if(NOT LMDBXX_INCLUDE_DIR) if(NOT LMDBXX_INCLUDE_DIR)
find_path(LMDBXX_INCLUDE_DIR find_path(LMDBXX_INCLUDE_DIR

34
deps/CMakeLists.txt vendored
View file

@ -38,26 +38,40 @@ set(BOOST_URL
set(BOOST_SHA256 set(BOOST_SHA256
5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9) 5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9)
set(MATRIX_STRUCTS_URL https://github.com/mujx/matrix-structs) set(
set(MATRIX_STRUCTS_TAG 8de04afea34e95c14d1dde82af390592dfde90dd) MATRIX_STRUCTS_URL
https://github.com/mujx/matrix-structs/archive/8de04afea34e95c14d1dde82af390592dfde90dd.tar.gz
)
set(MATRIX_STRUCTS_HASH
255a82a9e463261858cd7da18f34fd60d19882ab507d214e47ea47ff78ae68b6)
set(MTXCLIENT_URL https://github.com/mujx/mtxclient) set(
set(MTXCLIENT_TAG ca66424489b4d3e6ea447b853157fa88f0b849b3) MTXCLIENT_URL
https://github.com/mujx/mtxclient/archive/10894678e982bc037a0aa4cf650b89a566ccbc52.tar.gz
)
set(MTXCLIENT_HASH
9bbb4613e6ed7c9886575221e1820c4aeda302ff29703e9040e53a2d0236c8ea)
set(TWEENY_URL https://github.com/mobius3/tweeny) set(
set(TWEENY_TAG b94ce07cfb02a0eb8ac8aaf66137dabdaea857cf) TWEENY_URL
https://github.com/mobius3/tweeny/archive/b94ce07cfb02a0eb8ac8aaf66137dabdaea857cf.tar.gz
)
set(TWEENY_HASH
9a632b9da84823fae002ad5d9ba02c8d77c0a3810479974c6b637c5504165475)
set( set(
LMDBXX_HEADER_URL LMDBXX_HEADER_URL
https://raw.githubusercontent.com/bendiken/lmdbxx/0b43ca87d8cfabba392dfe884eb1edb83874de02/lmdb%2B%2B.h https://raw.githubusercontent.com/bendiken/lmdbxx/0b43ca87d8cfabba392dfe884eb1edb83874de02/lmdb%2B%2B.h
) )
set(LMDBXX_SHA c57b501a4e8fa1187fa7fd348da415c7685a50a7cb25b17b3f257b9e9426f73d) set(LMDBXX_HASH
c57b501a4e8fa1187fa7fd348da415c7685a50a7cb25b17b3f257b9e9426f73d)
set(OLM_URL https://git.matrix.org/git/olm.git) set(OLM_URL https://git.matrix.org/git/olm.git)
set(OLM_TAG 4065c8e11a33ba41133a086ed3de4da94dcb6bae) set(OLM_TAG 4065c8e11a33ba41133a086ed3de4da94dcb6bae)
set(SPDLOG_URL https://github.com/gabime/spdlog) set(SPDLOG_URL https://github.com/gabime/spdlog/archive/v1.0.0.tar.gz)
set(SPDLOG_TAG 560df2878ad308b27873b3cc5e810635d69cfad6) set(SPDLOG_HASH
90d5365121bcd2c41ce94dfe6a460e89507a2dfef6133fe5fad5bb35ac4ef0a1)
if(USE_BUNDLED_BOOST) if(USE_BUNDLED_BOOST)
include(Boost) include(Boost)
@ -81,7 +95,7 @@ endif()
if(USE_BUNDLED_LMDBXX) if(USE_BUNDLED_LMDBXX)
file(DOWNLOAD ${LMDBXX_HEADER_URL} ${DEPS_INSTALL_DIR}/include/lmdb++.h file(DOWNLOAD ${LMDBXX_HEADER_URL} ${DEPS_INSTALL_DIR}/include/lmdb++.h
EXPECTED_HASH SHA256=${LMDBXX_SHA}) EXPECTED_HASH SHA256=${LMDBXX_HASH})
endif() endif()
if(WIN32) if(WIN32)

5
deps/cmake/MatrixClient.cmake vendored
View file

@ -16,9 +16,8 @@ set(BOOST_BUNDLE_ROOT "-DBOOST_ROOT=${DEPS_BUILD_DIR}/boost")
ExternalProject_Add( ExternalProject_Add(
MatrixClient MatrixClient
DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/mtxclient URL ${MTXCLIENT_URL}
GIT_REPOSITORY ${MTXCLIENT_URL} URL_HASH SHA256=${MTXCLIENT_HASH}
GIT_TAG ${MTXCLIENT_TAG}
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
SOURCE_DIR ${DEPS_BUILD_DIR}/mtxclient SOURCE_DIR ${DEPS_BUILD_DIR}/mtxclient

5
deps/cmake/MatrixStructs.cmake vendored
View file

@ -7,9 +7,8 @@ endif()
ExternalProject_Add( ExternalProject_Add(
MatrixStructs MatrixStructs
DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/matrix_structs URL ${MATRIX_STRUCTS_URL}
GIT_REPOSITORY ${MATRIX_STRUCTS_URL} URL_HASH SHA256=${MATRIX_STRUCTS_HASH}
GIT_TAG ${MATRIX_STRUCTS_TAG}
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
SOURCE_DIR ${DEPS_BUILD_DIR}/matrix_structs SOURCE_DIR ${DEPS_BUILD_DIR}/matrix_structs

4
deps/cmake/SpdLog.cmake vendored
View file

@ -7,8 +7,8 @@ endif()
ExternalProject_Add( ExternalProject_Add(
SpdLog SpdLog
GIT_REPOSITORY ${SPDLOG_URL} URL ${SPDLOG_URL}
GIT_TAG ${SPDLOG_TAG} URL_HASH SHA256=${SPDLOG_HASH}
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
SOURCE_DIR ${DEPS_BUILD_DIR}/spdlog SOURCE_DIR ${DEPS_BUILD_DIR}/spdlog

4
deps/cmake/Tweeny.cmake vendored
View file

@ -7,8 +7,8 @@ endif()
ExternalProject_Add( ExternalProject_Add(
Tweeny Tweeny
GIT_REPOSITORY ${TWEENY_URL} URL ${TWEENY_URL}
GIT_TAG ${TWEENY_TAG} URL_HASH SHA256=${TWEENY_HASH}
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
SOURCE_DIR ${DEPS_BUILD_DIR}/tweeny SOURCE_DIR ${DEPS_BUILD_DIR}/tweeny

3
src/Logging.cpp
View file

@ -1,7 +1,8 @@
#include "Logging.h" #include "Logging.h"
#include "spdlog/sinks/rotating_file_sink.h"
#include "spdlog/sinks/stdout_sinks.h"
#include <iostream> #include <iostream>
#include <spdlog/sinks/file_sinks.h>
namespace { namespace {
std::shared_ptr<spdlog::logger> db_logger = nullptr; std::shared_ptr<spdlog::logger> db_logger = nullptr;