From df5006eac948fff1104a15b8fa09f4ab53501ca2 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Wed, 17 Dec 2014 19:29:30 -0800
Subject: [PATCH] Update autobuild to point to new version of jsoncpp and
change lib names to match those in package
---
autobuild.xml | 6 +++---
indra/cmake/JsonCpp.cmake | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 24c020b08a1..eb236c0f0ed 100755
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1218,16 +1218,16 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>b5803620f7bf79460145020ce38c7d87</string>
+ <string>e5a832cffe307a1e814ca0664be30b10</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/jsoncpp_3p-update-jsoncpp/rev/297281/arch/CYGWIN/installer/jsoncpp-0.5.0.297281-windows-297281.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/jsoncpp_3p-update-jsoncpp/rev/297580/arch/CYGWIN/installer/jsoncpp-0.5.0.297580-windows-297580.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
<key>version</key>
- <string>0.5.0.297281</string>
+ <string>0.5.0.297580</string>
</map>
<key>kdu</key>
<map>
diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake
index bf2d4702697..079619adf86 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_libmtd.lib
- optimized json_libmt)
+ debug json_libmdd.lib
+ optimized json_libmd.lib)
elseif (DARWIN)
set(JSONCPP_LIBRARIES libjson_darwin_libmt.a)
elseif (LINUX)
--
GitLab