diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-18 21:29:25 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-18 21:29:25 -0500 |
| commit | 7b9d54379f5ede0b046d2263487bb566f1928b23 (patch) | |
| tree | 62b8cb8323e87437587e4c8499c72747f95bb2bb | |
| parent | 101167d3ae7c15125d2e83f6c52c0781ebcb4bee (diff) | |
use improved packaging for jsoncpp
| -rw-r--r-- | autobuild.xml | 12 | ||||
| -rw-r--r-- | indra/cmake/JsonCpp.cmake | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/autobuild.xml b/autobuild.xml index 3cce930f28..dfd3051ed4 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -884,9 +884,9 @@ <key>archive</key> <map> <key>hash</key> - <string>de8b96120c274e052abb4f692861be46</string> + <string>22c2ab6ef046c0c1f6cf674297f3e8ef</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-jsoncpp/rev/220079/arch/Darwin/installer/jsoncpp-0.5.0-darwin-20110131.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-jsoncpp/rev/221698/arch/Darwin/installer/jsoncpp-0.5.0-darwin-20110218.tar.bz2</string> </map> <key>name</key> <string>darwin</string> @@ -896,9 +896,9 @@ <key>archive</key> <map> <key>hash</key> - <string>db7826354e60fb4ae14bf40258c088af</string> + <string>20546118096e4828d9f29913ec7d954a</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-jsoncpp/rev/220079/arch/Linux/installer/jsoncpp-0.5.0-linux-20110131.tar.bz2</string> + <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> </map> <key>name</key> <string>linux</string> @@ -908,9 +908,9 @@ <key>archive</key> <map> <key>hash</key> - <string>afff2018e6a887c281b072eecdd9343e</string> + <string>0959e349c4f7c0b33539269502486737</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-jsoncpp/rev/220579/arch/CYGWIN/installer/jsoncpp-0.5.0-windows-20110208.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-jsoncpp/rev/221698/arch/CYGWIN/installer/jsoncpp-0.5.0-windows-20110218.tar.bz2</string> </map> <key>name</key> <string>windows</string> diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake index 96488360a4..7c686eff07 100644 --- a/indra/cmake/JsonCpp.cmake +++ b/indra/cmake/JsonCpp.cmake @@ -14,9 +14,9 @@ else (STANDALONE) 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.3.2_libmt) + set(JSONCPP_LIBRARIES libjson_linux-gcc-4.1.3_libmt) endif (WINDOWS) set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/json) endif (STANDALONE) |