diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-04-03 11:06:33 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-04-03 11:06:33 -0700 |
| commit | 36a0a58487063152d8aacdeb22060025fe0021c7 (patch) | |
| tree | 58a59dee2b88e1e51391987b157a37b3c8cd710b /indra/cmake | |
| parent | 8b5b0ace9bfb83540fbc73376b639180d6d63a3b (diff) | |
| parent | fa6add3fcd300b21142e3381f35851b3404ee02a (diff) | |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/VisualLeakDetector.cmake | 15 | ||||
| -rw-r--r-- | indra/cmake/WebKitLibPlugin.cmake | 7 |
2 files changed, 19 insertions, 3 deletions
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) 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 |