summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAndrew A. de Laix <alain@lindenlab.com>2011-01-31 15:19:49 -0800
committerAndrew A. de Laix <alain@lindenlab.com>2011-01-31 15:19:49 -0800
commit8adcaa147de9e8dabaf6e64fbd8af0ccc61c4519 (patch)
tree18564995b6605716ad7d7385857efb5e31ee933f /indra
parentd9a0a04af4d48d8f1e8ef6e70d3d0863689071bd (diff)
update mac and linux json libs.
Diffstat (limited to 'indra')
-rw-r--r--indra/cmake/JsonCpp.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake
index 5d571e734a..d878f70a17 100644
--- a/indra/cmake/JsonCpp.cmake
+++ b/indra/cmake/JsonCpp.cmake
@@ -14,9 +14,9 @@ else (STANDALONE)
# debug json_vc100_libmt
optimized json_vc100_libmt)
elseif (DARWIN)
- set(JSONCPP_LIBRARIES json_mac-universal-gcc_libmt)
+ set(JSONCPP_LIBRARIES libjson_linux-gcc-4.0.1_libmt)
elseif (LINUX)
- set(JSONCPP_LIBRARIES jsoncpp)
+ set(JSONCPP_LIBRARIES libjson_linux-gcc-4.3.2_libmt)
endif (WINDOWS)
set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/jsoncpp)
endif (STANDALONE)