Switch out jsoncpp for nlohmann json

Add llsdjson.* too!

indra/cmake/CMakeLists.txt

@@ -36,7 +36,6 @@ set(cmake_SOURCE_FILES
     FindGoogleBreakpad.cmake
     FindGooglePerfTools.cmake
     FindHunSpell.cmake
-    FindJsonCpp.cmake
     FindNDOF.cmake
     FindOpenJPEG.cmake
     FindTut.cmake
@@ -51,7 +50,7 @@ set(cmake_SOURCE_FILES
     GooglePerfTools.cmake
     Hunspell.cmake
     JPEG.cmake
-    JsonCpp.cmake
+    Json.cmake
     LLAddBuildTest.cmake
     LLAppearance.cmake
     LLAudio.cmake

indra/cmake/FindJsonCpp.cmake

@@ -1,39 +0,0 @@
-# -*- cmake -*-
-
-# - Find JSONCpp
-# Find the JSONCpp includes and library
-# This module defines
-#  JSONCPP_FOUND, System has libjsoncpp.
-#  JSONCPP_INCLUDE_DIRS - The libjsoncpp include directories.
-#  JSONCPP_LIBRARIES - The libraries needed to use libjsoncpp.
-#  JSONCPP_DEFINITIONS - Compiler switches required for using libjsoncpp.
-
-FIND_PACKAGE(PkgConfig)
-PKG_CHECK_MODULES(PC_JSONCPP jsoncpp)
-SET(JSONCPP_DEFINITIONS ${PC_JSONCPP_CFLAGS_OTHER})
-
-FIND_PATH(JSONCPP_INCLUDE_DIR json/reader.h
-  HINTS ${PC_JSONCPP_INCLUDE_DIR} ${PC_JSONCPP_INCLUDE_DIRS}
-  PATH_SUFFIXES jsoncpp)
-
-# Get the GCC compiler version
-EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
-            ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
-            OUTPUT_VARIABLE _gcc_COMPILER_VERSION
-            OUTPUT_STRIP_TRAILING_WHITESPACE
-            )
-
-# Try to find a library that was compiled with the same compiler version as we currently use.
-FIND_LIBRARY(JSONCPP_LIBRARY
-  NAMES libjson_linux-gcc-${_gcc_COMPILER_VERSION}_libmt.so libjsoncpp.so
-  HINTS ${PC_JSONCPP_LIBDIR} ${PC_JSONCPP_LIBRARY_DIRS}
-  PATHS /usr/lib /usr/local/lib)
-
-SET(JSONCPP_LIBRARIES ${JSONCPP_LIBRARY})
-SET(JSONCPP_INCLUDE_DIRS ${JSONCPP_INCLUDE_DIR})
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(JSONCPP DEFAULT_MSG
-  JSONCPP_LIBRARY JSONCPP_INCLUDE_DIR)
-
-MARK_AS_ADVANCED(JSONCPP_LIBRARY JSONCPP_INCLUDE_DIR)

indra/cmake/Json.cmake

@@ -0,0 +1,6 @@
+# -*- cmake -*-
+
+include(Prebuilt)
+
+use_prebuilt_binary(modernjson)
+set(JSON_INCLUDE_DIR "${LIBS_PREBUILT_DIR}/include")

indra/cmake/JsonCpp.cmake

@@ -1,22 +0,0 @@
-# -*- cmake -*-
-
-include(Prebuilt)
-
-set(JSONCPP_FIND_QUIETLY OFF)
-set(JSONCPP_FIND_REQUIRED ON)
-
-if (STANDALONE)
-  include(FindJsonCpp)
-else (STANDALONE)
-  use_prebuilt_binary(jsoncpp)
-  if (WINDOWS)
-    set(JSONCPP_LIBRARIES
-      debug jsoncppd.lib
-      optimized jsoncpp.lib)
-  elseif (DARWIN)
-    set(JSONCPP_LIBRARIES json_linux-gcc-4.0.1_libmt)
-  elseif (LINUX)
-    set(JSONCPP_LIBRARIES jsoncpp)
-  endif (WINDOWS)
-  set(JSONCPP_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/)
-endif (STANDALONE)