Skip to content

Commit

Permalink
MAINT: Update nlohmann::json
Browse files Browse the repository at this point in the history
  • Loading branch information
Krzmbrzl committed Jan 7, 2024
1 parent 8d19207 commit 34f334b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
url = https://github.com/wolfpld/tracy.git
[submodule "3rdparty/nlohmann_json"]
path = 3rdparty/nlohmann_json
url = https://github.com/ArthurSonzogni/nlohmann_json_cmake_fetchcontent
url = https://github.com/nlohmann/json.git
[submodule "3rdparty/gsl"]
path = 3rdparty/gsl
url = https://github.com/microsoft/GSL.git
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/nlohmann_json
3 changes: 2 additions & 1 deletion src/mumble/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 34f334b

Please sign in to comment.