summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-11-03 16:28:04 -0800
committerMerov Linden <merov@lindenlab.com>2014-11-03 16:28:04 -0800
commit1f23a35a2c397ba53fc338187a4d3e74dac44589 (patch)
tree38fa43d6c1532cc1228397a8b2558a0b48c56dde /indra
parent828f47892151737bd5afe39b19c83d2b04fe9192 (diff)
DD-235 : Use newly built jsoncpp libraries that do include the security fix
Diffstat (limited to 'indra')
-rwxr-xr-xindra/cmake/JsonCpp.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake
index 0aab2d6634..d6d05af315 100755
--- a/indra/cmake/JsonCpp.cmake
+++ b/indra/cmake/JsonCpp.cmake
@@ -14,7 +14,7 @@ else (USESYSTEMLIBS)
debug json_vc100debug_libmt.lib
optimized json_vc100_libmt)
elseif (DARWIN)
- set(JSONCPP_LIBRARIES libjson_linux-gcc-4.0.1_libmt.a)
+ set(JSONCPP_LIBRARIES libjson_darwin_libmt.a)
elseif (LINUX)
set(JSONCPP_LIBRARIES libjson_linux-gcc-4.1.3_libmt.a)
endif (WINDOWS)