From 7b9d54379f5ede0b046d2263487bb566f1928b23 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Fri, 18 Feb 2011 21:29:25 -0500
Subject: use improved packaging for jsoncpp

---
 indra/cmake/JsonCpp.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/cmake')

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)
-- 
cgit v1.2.3


From 2d268422deb1846da889e38100eae60b42c4d21c Mon Sep 17 00:00:00 2001
From: Nicky <nickyd_sl@yahoo.com>
Date: Sat, 19 Feb 2011 20:27:38 +0100
Subject: Do not add <jsonpath>/include/json as an include director. Instead
 use <jsonpath>/include. Otherwise include/json/features.h will mask
 /usr/include/features.

---
 indra/cmake/JsonCpp.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake
index 7c686eff07..66c1739ff4 100644
--- a/indra/cmake/JsonCpp.cmake
+++ b/indra/cmake/JsonCpp.cmake
@@ -18,5 +18,5 @@ else (STANDALONE)
   elseif (LINUX)
     set(JSONCPP_LIBRARIES libjson_linux-gcc-4.1.3_libmt)
   endif (WINDOWS)
-  set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/json)
+  set(JSONCPP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
 endif (STANDALONE)
-- 
cgit v1.2.3