From 081dfd3328db1bc93439b3001c889a6829297fca Mon Sep 17 00:00:00 2001
From: Jason Rhinelander <jason@imaginary.ca>
Date: Thu, 20 Oct 2022 12:04:46 -0300
Subject: [PATCH] Update submodules to latest version:

cpr: 1.9.2
cxxopts: 3.0.0
ghc-filesystem: 1.5.12
nlohmann-json: 3.11.2
pybind11: 2.10.0
sqlite_orm: 1.7.1

Plus other updates need to make these work:
- cpr needs a cprver.h configured with the version (cmake code copied
  from oxen-core).
---
 external/CMakeLists.txt | 15 +++++++++++++++
 external/cpr            |  2 +-
 external/cxxopts        |  2 +-
 external/ghc-filesystem |  2 +-
 external/nlohmann       |  2 +-
 external/pybind11       |  2 +-
 external/sqlite_orm     |  2 +-
 7 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 0e43855c0..d235c1ec2 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -124,4 +124,19 @@ if(WITH_BOOTSTRAP)
   target_include_directories(cpr PUBLIC cpr/include)
   target_compile_definitions(cpr PUBLIC CPR_CURL_NOSIGNAL)
   add_library(cpr::cpr ALIAS cpr)
+
+  file(READ cpr/CMakeLists.txt cpr_cmake_head LIMIT 1000)
+  if(cpr_cmake_head MATCHES "project\\(cpr VERSION ([0-9]+)\.([0-9]+)\.([0-9]+) LANGUAGES CXX\\)")
+    set(cpr_VERSION_MAJOR ${CMAKE_MATCH_1})
+    set(cpr_VERSION_MINOR ${CMAKE_MATCH_2})
+    set(cpr_VERSION_PATCH ${CMAKE_MATCH_3})
+    set(cpr_VERSION "${cpr_VERSION_MAJOR}.${cpr_VERSION_MINOR}.${cpr_VERSION_PATCH}")
+    set(cpr_VERSION_NUM "(${cpr_VERSION_MAJOR} * 0x10000 + ${cpr_VERSION_MINOR} * 0x100 + ${cpr_VERSION_PATCH})")
+
+    configure_file(cpr/cmake/cprver.h.in "${CMAKE_CURRENT_BINARY_DIR}/cpr_generated_includes/cpr/cprver.h")
+    target_include_directories(cpr PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/cpr_generated_includes")
+  else()
+    message(FATAL_ERROR "Could not identify cpr submodule version!")
+  endif()
+
 endif()
diff --git a/external/cpr b/external/cpr
index aac5058a1..f88fd7737 160000
--- a/external/cpr
+++ b/external/cpr
@@ -1 +1 @@
-Subproject commit aac5058a15e9ad5ad393973dc6fe44d7614a7f55
+Subproject commit f88fd7737de3e640c61703eb57a0fa0ce00c60cd
diff --git a/external/cxxopts b/external/cxxopts
index 6fa46a748..c74846a89 160000
--- a/external/cxxopts
+++ b/external/cxxopts
@@ -1 +1 @@
-Subproject commit 6fa46a748838d5544ff8e9ab058906ba2c4bc0f3
+Subproject commit c74846a891b3cc3bfa992d588b1295f528d43039
diff --git a/external/ghc-filesystem b/external/ghc-filesystem
index 2a8b380f8..cd6805e94 160000
--- a/external/ghc-filesystem
+++ b/external/ghc-filesystem
@@ -1 +1 @@
-Subproject commit 2a8b380f8d4e77b389c42a194ab9c70d8e3a0f1e
+Subproject commit cd6805e94dd5d6346be1b75a54cdc27787319dd2
diff --git a/external/nlohmann b/external/nlohmann
index db78ac1d7..bc889afb4 160000
--- a/external/nlohmann
+++ b/external/nlohmann
@@ -1 +1 @@
-Subproject commit db78ac1d7716f56fc9f1b030b715f872f93964e4
+Subproject commit bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d
diff --git a/external/pybind11 b/external/pybind11
index 8de7772cc..aa304c9c7 160000
--- a/external/pybind11
+++ b/external/pybind11
@@ -1 +1 @@
-Subproject commit 8de7772cc72daca8e947b79b83fea46214931604
+Subproject commit aa304c9c7d725ffb9d10af08a3b34cb372307020
diff --git a/external/sqlite_orm b/external/sqlite_orm
index 4c6a46bd4..fdcc1da46 160000
--- a/external/sqlite_orm
+++ b/external/sqlite_orm
@@ -1 +1 @@
-Subproject commit 4c6a46bd4dcfba14a650e0fafb86331526878587
+Subproject commit fdcc1da46fbd90feb886c0588462a62d29eb5a06