From 6c3d44449032e386c2b4163c3635f1fe6934e5d7 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Fri, 10 Feb 2012 14:02:09 -0800
Subject: EXP-1889 FIX As a Second Life viewer developer, I would like a tool
 that helps me find memory leaks.

---
 indra/cmake/VisualLeakDetector.cmake | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 indra/cmake/VisualLeakDetector.cmake

(limited to 'indra/cmake')

diff --git a/indra/cmake/VisualLeakDetector.cmake b/indra/cmake/VisualLeakDetector.cmake
new file mode 100644
index 0000000000..d3ba554e46
--- /dev/null
+++ b/indra/cmake/VisualLeakDetector.cmake
@@ -0,0 +1,15 @@
+# -*- cmake -*-
+
+if (VIEWER)
+
+  set(INCLUDE_VLD_CMAKE OFF CACHE BOOL "Build the Windows viewer with Visual Leak Detector turned on or off")
+
+  if (INCLUDE_VLD_CMAKE)
+
+    if (WINDOWS)
+      add_definitions(-DINCLUDE_VLD=1)
+    endif (WINDOWS)
+
+  endif (INCLUDE_VLD_CMAKE)
+
+endif (VIEWER)
-- 
cgit v1.2.3


From ddbac6dbe42b02775d57bd7a9ac82f9b7920559b Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Tue, 28 Feb 2012 17:21:52 +0200
Subject: EXP-1633 FIXED Updated llqtwebkit package for Linux and
 WebKitLibPlugin build configuration.

---
 indra/cmake/WebKitLibPlugin.cmake | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake
index 91b49e75d7..d9df78bfc8 100644
--- a/indra/cmake/WebKitLibPlugin.cmake
+++ b/indra/cmake/WebKitLibPlugin.cmake
@@ -70,9 +70,10 @@ elseif (LINUX)
         QtNetwork
         QtGui
         QtCore
-        qgif
-        qjpeg
-        jpeg
+        jscore
+#        qgif
+#        qjpeg
+#        jpeg
         fontconfig
         X11
         Xrender
-- 
cgit v1.2.3