[Lib] Update nlohmann json and switch it to FetchContent instead of prebuilts. (Alchemy sync)

2020-03-29 16:33:11 -05:00
parent a7e56d2af9
commit 0b992fdd46
5 changed files with 16 additions and 36 deletions
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -12,7 +12,6 @@ include(Linking)
 include(Boost)
 include(OpenSSL)
 include(LLSharedLibs)
-include(Json)
 include(Copy3rdPartyLibs)
 include(ZLIB)
 include(URIPARSER)
@@ -300,6 +299,7 @@ target_link_libraries(
    ${Boost_SYSTEM_LIBRARY}
    ${CORESERVICES_LIBRARY}
    ${URIPARSER_LIBRARY}
+    nlohmann_json::nlohmann_json
    ${RT_LIBRARY}
    )