MAINT: Update nlohmann::json

mumble-voip · Dec 31, 2023 · 2801283 · 2801283
1 parent ce07820
commit 2801283
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/3rdparty/nlohmann_json b/3rdparty/nlohmann_json
diff --git a/src/mumble/CMakeLists.txt b/src/mumble/CMakeLists.txt
@@ -491,7 +491,8 @@ endif()
 
 if(bundled-json)
 	set(JSON_BuildTests OFF CACHE INTERNAL "")
-	set(JSON_ImplicitConversions OFF CACHE INTERNAL "")
+	set(JSON_ImplicitConversions ON CACHE INTERNAL "")
+	set(JSON_SystemInclude ON CACHE INTERNAL "")
 	add_subdirectory("${3RDPARTY_DIR}/nlohmann_json/" "${CMAKE_CURRENT_BINARY_DIR}/nlohmann_json/" EXCLUDE_FROM_ALL)
 else()
 	find_pkg("nlohmann_json" REQUIRED)