Update JSON build deps.
Update JSON build dependencies, change the dockerfile and other
CI files that relate to this. Also update target mtxclient
revision.
2 files changed, 17 insertions, 27 deletions
diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
index 418ec82e..290b523d 100644
--- a/deps/CMakeLists.txt
+++ b/deps/CMakeLists.txt
@@ -45,10 +45,10 @@ set(BOOST_SHA256
set(
MTXCLIENT_URL
- https://github.com/Nheko-Reborn/mtxclient/archive/67d39691666bcdf3cc660db19ccc0d9941df13fd.tar.gz
+ https://github.com/Nheko-Reborn/mtxclient/archive/5dc567a4a494a2152658c6586e0d7637ecba85b4.tar.gz
)
set(MTXCLIENT_HASH
- 4aeb69a3261aec96bd1fbce2fedc10e3771d87a5a82657bab8bc6006b7f1ad10)
+ afea7b9681657233f6e833cccd161af66e320654be0c6bcffba855420e37f415)
set(
TWEENY_URL
https://github.com/mobius3/tweeny/archive/b94ce07cfb02a0eb8ac8aaf66137dabdaea857cf.tar.gz
diff --git a/deps/cmake/Json.cmake b/deps/cmake/Json.cmake
index a37cc325..3b63550e 100644
--- a/deps/cmake/Json.cmake
+++ b/deps/cmake/Json.cmake
@@ -1,29 +1,19 @@
ExternalProject_Add(
- Json
- PREFIX ${CMAKE_CURRENT_SOURCE_DIR}/Json
- GIT_REPOSITORY https://github.com/nlohmann/json.git
- # For shallow git clone (without downloading whole history)
- # GIT_SHALLOW 1
- # For point at certain tag
- GIT_TAG v3.2.0
- #disables auto update on every build
- UPDATE_DISCONNECTED 1
- #disable following
- CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_DIR "" INSTALL_COMMAND ""
- )
-# Update json target
-add_custom_target(external-Json-update
- COMMENT "Updated Nlohmann/Json"
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Json/src/Json
- COMMAND ${GIT_EXECUTABLE} pull
- DEPENDS Json)
+ Json
-#ExternalProject_Add(
-# json
-#
-#
-# DOWNLOAD_COMMAND file(DOWNLOAD ${JSON_HEADER_URL} ${DEPS_INSTALL_DIR}/include/json.hpp
-# EXPECTED_HASH SHA256=${JSON_HEADER_HASH})
-#)
+ GIT_REPOSITORY ${JSON_URL}
+ GIT_TAG ${JSON_TAG}
+
+ BUILD_IN_SOURCE 1
+ SOURCE_DIR ${DEPS_BUILD_DIR}/json
+
+ CONFIGURE_COMMAND ${CMAKE_COMMAND}
+ -DJSON_BuildTests=OFF
+ -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
+ -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+
+ BUILD_COMMAND ${CMAKE_COMMAND} --build ${DEPS_BUILD_DIR}/json
+ INSTALL_COMMAND make install
+)
list(APPEND THIRD_PARTY_DEPS Json)
|
