diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-05-30 11:02:31 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-05-30 11:02:31 -0400 |
| commit | dfdb88305e4612c54f190c1ba237bdb609224d74 (patch) | |
| tree | 23f73597a41f8db0cc0c98b64255d620e931ba20 /indra/cmake/JsonCpp.cmake | |
| parent | 5ed8df22cd59680a685c4ada7daa5555bf59d4fe (diff) | |
| parent | 4189cb74421794ba123bf8724caa843c9d9d1c78 (diff) | |
Merge branch 'release/maint-b' into nat/catch-test-blown-stack.
Retargeting PR #1496 to Maint B.
Diffstat (limited to 'indra/cmake/JsonCpp.cmake')
| -rw-r--r-- | indra/cmake/JsonCpp.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index 17f8e47a97..a9b992ab20 100644 --- a/indra/cmake/JsonCpp.cmake +++ b/indra/cmake/JsonCpp.cmake @@ -12,6 +12,6 @@ if (WINDOWS) elseif (DARWIN) target_link_libraries( ll::jsoncpp INTERFACE libjson_darwin_libmt.a ) elseif (LINUX) - target_link_libraries( ll::jsoncpp INTERFACE libjson_linux-gcc-4.1.3_libmt.a ) + target_link_libraries( ll::jsoncpp INTERFACE libjson_linux-gcc-11_libmt.a ) endif (WINDOWS) target_include_directories( ll::jsoncpp SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include) |