Update nlohmann json to 3.7.3

autobuild.xml

@@ -2090,38 +2090,6 @@
           </map>
         </map>
       </map>
-      <key>modernjson</key>
-      <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2013-2019 Niels Lohmann</string>
-        <key>description</key>
-        <string>JSON for Modern C++</string>
-        <key>license</key>
-        <string>MIT</string>
-        <key>license_file</key>
-        <string>LICENSES/modernjson.txt</string>
-        <key>name</key>
-        <string>modernjson</string>
-        <key>platforms</key>
-        <map>
-          <key>common</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>fa2eb2ed28bb18730484ed5da29ac9d5</string>
-              <key>hash_algorithm</key>
-              <string>md5</string>
-              <key>url</key>
-              <string>https://pkg.alchemyviewer.org/repository/autobuild-external/modernjson/common/modernjson-3.7.0.192211123-common-192211123.tar.bz2</string>
-            </map>
-            <key>name</key>
-            <string>common</string>
-          </map>
-        </map>
-        <key>version</key>
-        <string>3.7.0.192211123</string>
-      </map>
       <key>ndPhysicsStub</key>
       <map>
         <key>copyright</key>

indra/cmake/CMakeLists.txt

@@ -42,7 +42,6 @@ set(cmake_SOURCE_FILES
     Havok.cmake
     Hunspell.cmake
     JPEG.cmake
-    Json.cmake
     LLAddBuildTest.cmake
     LLAppearance.cmake
     LLAudio.cmake

indra/cmake/Json.cmake

-# -*- cmake -*-
-
-include(Prebuilt)
-
-use_prebuilt_binary(modernjson)
-set(JSON_INCLUDE_DIR "${LIBS_PREBUILT_DIR}/include")

indra/deps/CMakeLists.txt

@@ -13,7 +13,12 @@ FetchContent_Declare(
 FetchContent_Declare(
   fmt
   GIT_REPOSITORY https://github.com/fmtlib/fmt.git
-  GIT_TAG        f94b7364b9409f05207c3af3fa4666730e11a854
+  GIT_TAG        6.1.2
+  )
+FetchContent_Declare(
+  nlohmann_json
+  GIT_REPOSITORY https://github.com/nlohmann/json.git
+  GIT_TAG        v3.7.3
   )
 FetchContent_Declare(
   absl
@@ -42,5 +47,14 @@ endif()
 #Download the rest of the libraries
 FetchContent_MakeAvailable(fmt)
 
+# Typically you don't care so much for a third party library's tests to be
+# run from your own project's code.
+set(JSON_BuildTests OFF CACHE INTERNAL "")
+
+# If you only include this third party in PRIVATE source files, you do not
+# need to install it when your main project gets installed.
+set(JSON_Install OFF CACHE INTERNAL "")
+FetchContent_MakeAvailable(nlohmann_json)
+
 unset(CMAKE_FOLDER)
 unset(CMAKE_POSITION_INDEPENDENT_CODE)

indra/llcommon/CMakeLists.txt

@@ -13,7 +13,6 @@ include(Linking)
 include(Boost)
 include(OpenSSL)
 include(LLSharedLibs)
-include(Json)
 include(GooglePerfTools)
 include(Copy3rdPartyLibs)
 include(ZLIB)
@@ -24,7 +23,6 @@ include_directories(
     ${LLCOMMON_INCLUDE_DIRS}
     ${LLDARWIN_INCLUDE_DIRS}
     ${OPENSSL_INCLUDE_DIRS}
-    ${JSON_INCLUDE_DIR}
     ${ZLIB_INCLUDE_DIRS}
     ${BREAKPAD_INCLUDE_DIRECTORIES}
     ${URIPARSER_INCLUDE_DIRS}
@@ -312,6 +310,7 @@ target_link_libraries(
     absl::flat_hash_map
     absl::node_hash_map
     fmt::fmt
+    nlohmann_json::nlohmann_json
     ${RT_LIBRARY}
     )
 

indra/llmessage/CMakeLists.txt

@@ -13,7 +13,6 @@ include(LLAddBuildTest)
 include(Python)
 include(Tut)
 include(Python)
-include(Json)
 include(NGHTTP2)
 
 include_directories (${CMAKE_CURRENT_SOURCE_DIR})
@@ -24,7 +23,6 @@ include_directories(
     ${LLMATH_INCLUDE_DIRS}
     ${LLMESSAGE_INCLUDE_DIRS}
     ${LLVFS_INCLUDE_DIRS}
-    ${JSON_INCLUDE_DIR}
     )
 
 include_directories(
@@ -218,6 +216,7 @@ endif(USE_PRECOMPILED_HEADERS)
 
 target_link_libraries(
   llmessage
+  PUBLIC
   ${LLCOREHTTP_LIBRARIES}
   ${LLVFS_LIBRARIES}
   ${LLMATH_LIBRARIES}
@@ -230,6 +229,7 @@ target_link_libraries(
   ${BOOST_COROUTINE_LIBRARY}
   ${BOOST_CONTEXT_LIBRARY}
   ${BOOST_SYSTEM_LIBRARY}
+  nlohmann_json::nlohmann_json
   ${RT_LIBRARY}
   ${PTHREAD_LIBRARY}
   )

indra/newview/CMakeLists.txt

@@ -21,7 +21,6 @@ include(GLOD)
 include(GLEW)
 include(GooglePerfTools)
 include(Hunspell)
-include(Json)
 include(LLAppearance)
 include(LLDarwin)
 include(LLAudio)
@@ -80,7 +79,6 @@ endif(USE_CRASHPAD)
 include_directories(
     ${DBUSGLIB_INCLUDE_DIRS}
     ${ZLIB_INCLUDE_DIRS}
-    ${JSON_INCLUDE_DIR}
     ${GLOD_INCLUDE_DIR}
     ${LLDARWIN_INCLUDE_DIRS}
     ${LLAUDIO_INCLUDE_DIRS}
@@ -2042,6 +2040,7 @@ target_link_libraries(${VIEWER_BINARY_NAME}
     ${LLAPPEARANCE_LIBRARIES}
     absl::flat_hash_map
     absl::node_hash_map
+    nlohmann_json::nlohmann_json
     )
 
 set(ARTWORK_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH