# This is a combination of 3 commits.

# This is the 1st commit message: Fixes #39 # This is the commit message #2: covg # This is the commit message #3: groundwork
little-bear-labs · Nov 8, 2023 · 1c78f9c · 1c78f9c
1 parent 9031c3d
commit 1c78f9c
Show file tree

Hide file tree

Showing 14 changed files with 13,529 additions and 42 deletions.
diff --git a/cmake/conanfile.txt b/cmake/conanfile.txt
@@ -2,6 +2,7 @@
     abseil/20220623.1
     boost/1.81.0
     gtest/1.13.0
+    nlohmann_json/3.11.2
     openssl/1.1.1t
     protobuf/3.21.4
 [options]

diff --git a/cmake/patch.py b/cmake/patch.py
@@ -151,7 +151,7 @@ def electron_version(self, branch='main'):
     def unavailable(self):
         avail = list(map(as_int, self.available()))
         version_set = {}
-        fuzz = 114
+        fuzz = 115
         def check(version, version_set, s):
             i = as_int(version)
             by = (fuzz,0)

diff --git a/cmake/setup.cmake b/cmake/setup.cmake
@@ -103,4 +103,11 @@ function(with_vocab target)
                 OpenSSL::Crypto
         )
     endif()
+    find_package(nlohmann_json)
+    if(nlohmann_json_FOUND)
+        target_link_libraries(${target}
+            PUBLIC
+                nlohmann_json::nlohmann_json
+        )
+    endif()
 endfunction()