Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git

2020-04-01 19:26:41 -05:00
parent 332cef0f84 77f500cb64
commit 3ab800d99e
31 changed files with 94 additions and 61 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}
    )