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

Update dependencies

Browse source
This commit is contained in:
Nicolas Werner 2020-07-01 00:46:44 +02:00
parent 21a1f249f9
commit d72eb5eb2d
5 changed files with 51 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.ci/script.sh
View file

@ -71,7 +71,6 @@ cmake -GNinja -H. -Bbuild \
-DHUNTER_ROOT=".hunter" \ -DHUNTER_ROOT=".hunter" \
-DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF \ -DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF \
-DCMAKE_BUILD_TYPE=RelWithDebInfo -DHUNTER_CONFIGURATION_TYPES=RelWithDebInfo \ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHUNTER_CONFIGURATION_TYPES=RelWithDebInfo \
-DUSE_BUNDLED_OPENSSL=OFF \
-DCI_BUILD=ON -DCI_BUILD=ON
fi fi
cmake --build build cmake --build build

9
CMakeLists.txt
View file

@ -18,9 +18,8 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON CACHE BOOL "compile as PIC by default")
option(HUNTER_ENABLED "Enable Hunter package manager" OFF) option(HUNTER_ENABLED "Enable Hunter package manager" OFF)
include("cmake/HunterGate.cmake") include("cmake/HunterGate.cmake")
HunterGate( HunterGate(
URL "https://github.com/cpp-pm/hunter/archive/v0.23.244.tar.gz" URL "https://github.com/cpp-pm/hunter/archive/v0.23.260.tar.gz"
SHA1 "2c0f491fd0b80f7b09e3d21adb97237161ef9835" SHA1 "13775235910a3fa85644568d1c5be8271de72e1c"
LOCAL
) )
option(USE_BUNDLED_BOOST "Use the bundled version of Boost." ${HUNTER_ENABLED}) option(USE_BUNDLED_BOOST "Use the bundled version of Boost." ${HUNTER_ENABLED})
@ -328,7 +327,7 @@ find_package(Boost 1.70 REQUIRED
if(USE_BUNDLED_OPENSSL) if(USE_BUNDLED_OPENSSL)
hunter_add_package(OpenSSL) hunter_add_package(OpenSSL)
endif() endif()
find_package(OpenSSL REQUIRED) find_package(OpenSSL 1.1.0 REQUIRED)
if(USE_BUNDLED_MTXCLIENT) if(USE_BUNDLED_MTXCLIENT)
include(FetchContent) include(FetchContent)
set(BUILD_LIB_EXAMPLES OFF CACHE INTERNAL "") set(BUILD_LIB_EXAMPLES OFF CACHE INTERNAL "")
@ -336,7 +335,7 @@ if(USE_BUNDLED_MTXCLIENT)
FetchContent_Declare( FetchContent_Declare(
MatrixClient MatrixClient
GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git
GIT_TAG 68e043e1bf515e9072235151f74f7aac0838a9d3 GIT_TAG eddd95a896fad0c51fc800741d82bbc43fc6d41e
) )
FetchContent_MakeAvailable(MatrixClient) FetchContent_MakeAvailable(MatrixClient)
else() else()

2
cmake/Hunter/config.cmake
View file

@ -1,5 +1,5 @@
hunter_config( hunter_config(
Boost Boost
VERSION "1.70.0-p0" VERSION "1.70.0-p1"
CMAKE_ARGS IOSTREAMS_NO_BZIP2=1 CMAKE_ARGS IOSTREAMS_NO_BZIP2=1
) )

11
cmake/HunterGate.cmake
View file

@ -133,10 +133,14 @@ function(hunter_gate_self root version sha1 result)
string(SUBSTRING "${sha1}" 0 7 archive_id) string(SUBSTRING "${sha1}" 0 7 archive_id)
if(EXISTS "${root}/cmake/Hunter")
set(hunter_self "${root}")
else()
set( set(
hunter_self hunter_self
"${root}/_Base/Download/Hunter/${version}/${archive_id}/Unpacked" "${root}/_Base/Download/Hunter/${version}/${archive_id}/Unpacked"
) )
endif()
set("${result}" "${hunter_self}" PARENT_SCOPE) set("${result}" "${hunter_self}" PARENT_SCOPE)
endfunction() endfunction()
@ -490,6 +494,12 @@ macro(HunterGate)
) )
set(_master_location "${_hunter_self}/cmake/Hunter") set(_master_location "${_hunter_self}/cmake/Hunter")
if(EXISTS "${HUNTER_GATE_ROOT}/cmake/Hunter")
# Hunter downloaded manually (e.g. by 'git clone')
set(_unused "xxxxxxxxxx")
set(HUNTER_GATE_SHA1 "${_unused}")
set(HUNTER_GATE_VERSION "${_unused}")
else()
get_filename_component(_archive_id_location "${_hunter_self}/.." ABSOLUTE) get_filename_component(_archive_id_location "${_hunter_self}/.." ABSOLUTE)
set(_done_location "${_archive_id_location}/DONE") set(_done_location "${_archive_id_location}/DONE")
set(_sha1_location "${_archive_id_location}/SHA1") set(_sha1_location "${_archive_id_location}/SHA1")
@ -522,6 +532,7 @@ macro(HunterGate)
"try to update Hunter/HunterGate" "try to update Hunter/HunterGate"
) )
endif() endif()
endif()
include("${_master_location}") include("${_master_location}")
set_property(GLOBAL PROPERTY HUNTER_GATE_DONE YES) set_property(GLOBAL PROPERTY HUNTER_GATE_DONE YES)
endif() endif()

4
io.github.NhekoReborn.Nheko.json
View file

@ -146,9 +146,9 @@
"name": "mtxclient", "name": "mtxclient",
"sources": [ "sources": [
{ {
"sha256": "e4899cc4ce87397de2aef865e94ea2cdb8d9cb86253727e7d90532b925ecc770", "sha256": "6334bb71821a0fde54fe24f02ad393cdb6836633557ffdd239b29c5d5108daaf",
"type": "archive", "type": "archive",
"url": "https://github.com/Nheko-Reborn/mtxclient/archive/v0.3.1.tar.gz" "url": "https://github.com/Nheko-Reborn/mtxclient/archive/eddd95a896fad0c51fc800741d82bbc43fc6d41e.tar.gz"
} }
] ]
}, },