diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-12-12 18:21:37 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-12-12 18:21:37 -0500 |
| commit | eb5c0dd32a7f4e4a603fe88cfa5f18c30725d11a (patch) | |
| tree | b392e161013046ffd4f65d534243a11a5501ad38 /indra | |
| parent | 282d8c4c45f73c17ade0dc0c995ad18839b2dee9 (diff) | |
| parent | f7d1ece5bee79f030894cf24dc8e7a9135df9242 (diff) | |
merge latest fix from nat
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/cmake/JsonCpp.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index d6d05af315..bf2d470269 100755 --- a/indra/cmake/JsonCpp.cmake +++ b/indra/cmake/JsonCpp.cmake @@ -11,8 +11,8 @@ else (USESYSTEMLIBS) use_prebuilt_binary(jsoncpp) if (WINDOWS) set(JSONCPP_LIBRARIES - debug json_vc100debug_libmt.lib - optimized json_vc100_libmt) + debug json_libmtd.lib + optimized json_libmt) elseif (DARWIN) set(JSONCPP_LIBRARIES libjson_darwin_libmt.a) elseif (LINUX) |