From b3673e3985dbbafefa3754c5757e2493191d1483 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sat, 8 Aug 2020 16:40:08 -0400
Subject: [PATCH] Actually include nlohmann json dependency

---
 indra/deps/CMakeLists.txt | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/indra/deps/CMakeLists.txt b/indra/deps/CMakeLists.txt
index 2ce45871fb4..bdf7155449d 100644
--- a/indra/deps/CMakeLists.txt
+++ b/indra/deps/CMakeLists.txt
@@ -26,11 +26,11 @@ FetchContent_Declare(
 #   GIT_REPOSITORY https://github.com/fmtlib/fmt.git
 #   GIT_TAG        6.1.2
 #   )
-# FetchContent_Declare(
-#   nlohmann_json
-#   GIT_REPOSITORY https://github.com/nlohmann/json.git
-#   GIT_TAG        v3.7.3
-#   )
+FetchContent_Declare(
+  nlohmann_json
+  GIT_REPOSITORY https://github.com/nlohmann/json.git
+  GIT_TAG        v3.7.3
+  )
 FetchContent_Declare(
   absl
   GIT_REPOSITORY https://github.com/abseil/abseil-cpp.git
@@ -63,10 +63,10 @@ FetchContent_MakeAvailable(meshoptimizer)
 # # 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)
+# 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)
-- 
GitLab