From e2ccf468a1150882f7b02317bd43410c396ec2c2 Mon Sep 17 00:00:00 2001 From: Florian Albrechtskirchinger Date: Tue, 2 Aug 2022 12:18:53 +0200 Subject: [PATCH] Update nlohmann_json to v3.11.1 --- cmake/configs/default.cmake | 2 +- cmake/projects/nlohmann_json/hunter.cmake | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index b6c11117e0..77b078aff3 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -407,7 +407,7 @@ hunter_default_version(nanosvg VERSION 0.0.0-2b08dee-p0) hunter_default_version(ncnn VERSION 20180314-p2) hunter_default_version(ncursesw VERSION 6.1) hunter_default_version(nlohmann_fifo_map VERSION 0.0.0-0dfbf5d-p1) -hunter_default_version(nlohmann_json VERSION 3.10.5) +hunter_default_version(nlohmann_json VERSION 3.11.1) hunter_default_version(nng VERSION 1.1.1) hunter_default_version(nsync VERSION 1.14-p1) hunter_default_version(occt VERSION 7.4.0-p0) diff --git a/cmake/projects/nlohmann_json/hunter.cmake b/cmake/projects/nlohmann_json/hunter.cmake index 52b4f65034..679f2c7142 100644 --- a/cmake/projects/nlohmann_json/hunter.cmake +++ b/cmake/projects/nlohmann_json/hunter.cmake @@ -211,6 +211,15 @@ hunter_add_version( SHA1 8969f5ad1a422e01f040ff48dcae9c0e6ad0811d ) +# v3.11.0 omitted; was released with a bug + +hunter_add_version( + PACKAGE_NAME nlohmann_json + VERSION "3.11.1" + URL "https://github.com/nlohmann/json/archive/v3.11.1.tar.gz" + SHA1 ac7ee8446d7c5099a590c3fdb05df5ce56ee04c8 +) + hunter_cmake_args(nlohmann_json CMAKE_ARGS JSON_BuildTests=OFF) hunter_pick_scheme(DEFAULT url_sha1_cmake)