From 745845f79987e4b4ab7f5728746a0eda8898930f Mon Sep 17 00:00:00 2001
From: Monroe Williams <monroe@lindenlab.com>
Date: Thu, 27 Aug 2009 19:00:18 +0000
Subject: svn merge -r 129841:129910
 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910

svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05

Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
---
 indra/cmake/WebKitLibPlugin.cmake | 62 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 indra/cmake/WebKitLibPlugin.cmake

(limited to 'indra/cmake/WebKitLibPlugin.cmake')

diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake
new file mode 100644
index 0000000000..c84df2b839
--- /dev/null
+++ b/indra/cmake/WebKitLibPlugin.cmake
@@ -0,0 +1,62 @@
+# -*- cmake -*-
+include(Linking)
+include(Prebuilt)
+
+if (STANDALONE)
+    set(WEBKITLIBPLUGIN OFF CACHE BOOL
+        "WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.")
+else (STANDALONE)
+    use_prebuilt_binary(webkitlibplugin)
+    set(WEBKITLIBPLUGIN ON CACHE BOOL
+        "WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.")
+endif (STANDALONE)
+
+if (WINDOWS)
+    set(WEBKIT_PLUGIN_LIBRARIES 
+    debug llwebkitlibd
+    debug QtWebKitd4
+    debug QtOpenGLd4
+    debug QtNetworkd4
+    debug QtGuid4
+    debug QtCored4
+    debug qtmaind
+    optimized llwebkitlib
+    optimized QtWebKit4
+    optimized QtOpenGL4
+    optimized QtNetwork4
+    optimized QtGui4
+    optimized QtCore4
+    optimized qtmain
+    )
+elseif (DARWIN)
+    set(WEBKIT_PLUGIN_LIBRARIES
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libllwebkitlib.dylib
+        debug ${ARCH_PREBUILT_DIRS_RELEASE}/libllwebkitlib.dylib
+        )
+elseif (LINUX)
+    set(WEBKIT_PLUGIN_LIBRARIES
+        llwebkitlib
+
+        qgif
+#        qico
+        qjpeg
+#        qpng
+#        qtiff
+#        qsvg
+
+#        QtSvg
+        QtWebKit
+        QtOpenGL
+        QtNetwork
+        QtGui
+        QtCore
+
+        fontconfig
+        X11
+        GL
+
+#        sqlite3
+#        Xi
+#        SM
+        )
+endif (WINDOWS)
-- 
cgit v1.2.3


From 158946668a75a0dad7b53bc74fd2b6f8f4a4befc Mon Sep 17 00:00:00 2001
From: Adam Moss <moss@lindenlab.com>
Date: Mon, 31 Aug 2009 17:16:21 +0000
Subject: svn merge -r130875:131962
 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05_newllqtwebkit

DEV-31438 Rename LLMozLib (Qt/WebKit) to something else - LLQtWebKit
---
 indra/cmake/WebKitLibPlugin.cmake | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'indra/cmake/WebKitLibPlugin.cmake')

diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake
index c84df2b839..9ec23e80ca 100644
--- a/indra/cmake/WebKitLibPlugin.cmake
+++ b/indra/cmake/WebKitLibPlugin.cmake
@@ -6,21 +6,21 @@ if (STANDALONE)
     set(WEBKITLIBPLUGIN OFF CACHE BOOL
         "WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.")
 else (STANDALONE)
-    use_prebuilt_binary(webkitlibplugin)
+    use_prebuilt_binary(llqtwebkit)
     set(WEBKITLIBPLUGIN ON CACHE BOOL
         "WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.")
 endif (STANDALONE)
 
 if (WINDOWS)
     set(WEBKIT_PLUGIN_LIBRARIES 
-    debug llwebkitlibd
+    debug llqtwebkitd
     debug QtWebKitd4
     debug QtOpenGLd4
     debug QtNetworkd4
     debug QtGuid4
     debug QtCored4
     debug qtmaind
-    optimized llwebkitlib
+    optimized llqtwebkit
     optimized QtWebKit4
     optimized QtOpenGL4
     optimized QtNetwork4
@@ -30,12 +30,12 @@ if (WINDOWS)
     )
 elseif (DARWIN)
     set(WEBKIT_PLUGIN_LIBRARIES
-        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libllwebkitlib.dylib
-        debug ${ARCH_PREBUILT_DIRS_RELEASE}/libllwebkitlib.dylib
+        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib
+        debug ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib
         )
 elseif (LINUX)
     set(WEBKIT_PLUGIN_LIBRARIES
-        llwebkitlib
+        llqtwebkit
 
         qgif
 #        qico
@@ -53,6 +53,7 @@ elseif (LINUX)
 
         fontconfig
         X11
+        Xrender
         GL
 
 #        sqlite3
-- 
cgit v1.2.3