From 99ba5e2670d04baf641c6d612f253a46f857769e Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Wed, 2 Mar 2011 21:28:26 +0000
Subject: [PATCH] revert to old jsoncpp library on linux to fix build.
---
autobuild.xml | 4 ++--
indra/cmake/JsonCpp.cmake | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index b522878671..d9bfe77caa 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -896,9 +896,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>20546118096e4828d9f29913ec7d954a</string>
+ <string>7e6b2fc7ad4e12d94d01cc49c22c6f67</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-jsoncpp/rev/221698/arch/Linux/installer/jsoncpp-0.5.0-linux-20110219.tar.bz2</string>
+ <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-svn-r69-linux-20101013.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake
index 96488360a4..9024fa92a7 100644
--- a/indra/cmake/JsonCpp.cmake
+++ b/indra/cmake/JsonCpp.cmake
@@ -16,7 +16,7 @@ else (STANDALONE)
elseif (DARWIN)
set(JSONCPP_LIBRARIES libjson_linux-gcc-4.0.1_libmt.a)
elseif (LINUX)
- set(JSONCPP_LIBRARIES libjson_linux-gcc-4.3.2_libmt)
+ set(JSONCPP_LIBRARIES libjsoncpp.a)
endif (WINDOWS)
- set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/json)
+ set(JSONCPP_INCLUDE_DIRS "${LIBS_PREBUILT_DIR}/include/jsoncpp" "${LIBS_PREBUILT_DIR}/include/json")
endif (STANDALONE)
--
GitLab