User correct json lib when linking for Windows x86.

2015-05-07 11:47:34 +02:00 · 2015-05-07 11:47:34 +02:00 · 52efa3149a
parent 441b49a9ec
commit 52efa3149a
1 changed files with 9 additions and 3 deletions
--- 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)