From 2643fe6b1314facc2e1ecec6499a8c4492a56600 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 11 Apr 2023 11:15:12 +0200
Subject: [PATCH] [cpm] Bump nlohman/json to 3.10.5.
From 3.10 tarball also contains license file.
---
scripts/cmake/Dependencies.cmake | 10 +++++-----
web/data/versions.json | 4 +++-
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/scripts/cmake/Dependencies.cmake b/scripts/cmake/Dependencies.cmake
index e0edc4fb62b..6fa4ae31a60 100644
--- a/scripts/cmake/Dependencies.cmake
+++ b/scripts/cmake/Dependencies.cmake
@@ -195,17 +195,17 @@ endif()
CPMFindPackage(
NAME nlohmann_json
- VERSION 3.6.1
+ VERSION ${ogs.minimum_version.json}
# the git repo is incredibly large, so we download the archived include
# directory
- URL https://github.com/nlohmann/json/releases/download/v3.6.1/include.zip
- URL_HASH
- SHA256=69cc88207ce91347ea530b227ff0776db82dcb8de6704e1a3d74f4841bc651cf
+ URL https://github.com/nlohmann/json/releases/download/v${ogs.minimum_version.json}/include.zip
+ URL_HASH SHA256=${ogs.minimum_version.json_sha}
)
if(nlohmann_json_ADDED)
add_library(nlohmann_json::nlohmann_json INTERFACE IMPORTED)
target_include_directories(
- nlohmann_json::nlohmann_json INTERFACE ${nlohmann_json_SOURCE_DIR}
+ nlohmann_json::nlohmann_json
+ INTERFACE ${nlohmann_json_SOURCE_DIR}/include
)
endif()
diff --git a/web/data/versions.json b/web/data/versions.json
index 2272cd812e9..16d82f15c25 100644
--- a/web/data/versions.json
+++ b/web/data/versions.json
@@ -29,7 +29,9 @@
"gtest": "1.11.0",
"pybind11": "2.8.1",
"pybind11_for_py311": "2.10.4",
- "range-v3": "0.12.0"
+ "range-v3": "0.12.0",
+ "json": "3.10.5",
+ "json_sha": "b94997df68856753b72f0d7a3703b7d484d4745c567f3584ef97c96c25a5798e"
},
"tested_version": {
"ubuntu": "22.04",
--
GitLab