From 52efa3149a6c0912a014aa22c382ec4cdcdcd0e6 Mon Sep 17 00:00:00 2001
From: Nicky <sl.nicky.ml@googlemail.com>
Date: Thu, 7 May 2015 11:47:34 +0200
Subject: [PATCH] User correct json lib when linking for Windows x86.

---
 indra/cmake/JsonCpp.cmake | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake
index 952af655b1..7e2becc06f 100755
--- a/indra/cmake/JsonCpp.cmake
+++ b/indra/cmake/JsonCpp.cmake
@@ -10,9 +10,15 @@ if (USESYSTEMLIBS)
 else (USESYSTEMLIBS)
   use_prebuilt_binary(jsoncpp)
   if (WINDOWS)
-    set(JSONCPP_LIBRARIES 
-      debug json_libmtd.lib
-      optimized json_libmt.lib)
+    if (ND_BUILD64BIT_ARCH)
+      set(JSONCPP_LIBRARIES
+        debug json_libmtd.lib
+        optimized json_libmt.lib)
+    else (ND_BUILD64BIT_ARCH)
+      set(JSONCPP_LIBRARIES
+        debug json_libmdd.lib
+        optimized json_libmd.lib)
+    endif (ND_BUILD64BIT_ARCH)
   elseif (DARWIN)
     set(JSONCPP_LIBRARIES libjson_darwin_libmt.a)
   elseif (LINUX)