From 38a2af923561f8865976843c58a21f851695c9c2 Mon Sep 17 00:00:00 2001
From: Alain Linden <alain@lindenlab.com>
Date: Thu, 10 Feb 2011 17:26:16 -0800
Subject: various fixes to get the debug build working; don't look for or copy
 msvc*80.dll's.

---
 indra/cmake/JsonCpp.cmake         | 2 +-
 indra/cmake/WebKitLibPlugin.cmake | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake
index 4a129d7115..5e6672ecd4 100644
--- a/indra/cmake/JsonCpp.cmake
+++ b/indra/cmake/JsonCpp.cmake
@@ -11,7 +11,7 @@ else (STANDALONE)
   use_prebuilt_binary(jsoncpp)
   if (WINDOWS)
     set(JSONCPP_LIBRARIES 
-#      debug json_vc100_libmt
+      debug json_vc100debug_libmt.lib
       optimized json_vc100_libmt)
   elseif (DARWIN)
     set(JSONCPP_LIBRARIES libjson_linux-gcc-4.0.1_libmt)
diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake
index 1cc02c1cac..1f5b0f5d84 100644
--- a/indra/cmake/WebKitLibPlugin.cmake
+++ b/indra/cmake/WebKitLibPlugin.cmake
@@ -35,7 +35,6 @@ else (STANDALONE)
 endif (STANDALONE)
 
 if (WINDOWS)
-  use_prebuilt_binary(qt)
   set(WEBKIT_PLUGIN_LIBRARIES
       debug llqtwebkitd
       debug QtWebKitd4
-- 
cgit v1.2.3