From beb04d00cb01f3c81dcaef69751d526a38ce29e5 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood
Date: Mon, 18 Oct 2010 23:39:16 +0200
Subject: Forgot QtWebKit and Qt plugins in last commit.

Standalone now works (I have no idea why it worked before, since
obviously I tested it before committing the previous commit).
---
 linden/indra/cmake/WebKitLibPlugin.cmake | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/cmake/WebKitLibPlugin.cmake b/linden/indra/cmake/WebKitLibPlugin.cmake
index 9c56838..a4befa4 100644
--- a/linden/indra/cmake/WebKitLibPlugin.cmake
+++ b/linden/indra/cmake/WebKitLibPlugin.cmake
@@ -4,7 +4,7 @@ include(Prebuilt)
 
 if (STANDALONE)
     # The minimal version, 4.4.3, is rather arbitrary: it's the version in Debian/Lenny.
-    find_package(Qt4 4.4.3 COMPONENTS QtCore QtGui QtNetwork QtOpenGL REQUIRED)
+    find_package(Qt4 4.4.3 COMPONENTS QtCore QtGui QtNetwork QtOpenGL QtWebKit REQUIRED)
     include(${QT_USE_FILE})
     set(QTDIR $ENV{QTDIR})
     if (QTDIR AND NOT "${QT_BINARY_DIR}" STREQUAL "${QTDIR}/bin")
@@ -14,6 +14,18 @@ if (STANDALONE)
         "or unset QTDIR if the found Qt is correct.")
     endif (QTDIR AND NOT "${QT_BINARY_DIR}" STREQUAL "${QTDIR}/bin")
     find_package(LLQtWebkit REQUIRED QUIET)
+    # Add the plugins.
+	set(QT_PLUGIN_LIBRARIES)
+	foreach(qlibname qgif qjpeg)
+      find_library(QT_PLUGIN_${qlibname} ${qlibname} PATHS ${QT_PLUGINS_DIR}/imageformats NO_DEFAULT_PATH)
+      if (QT_PLUGIN_${qlibname})
+	    list(APPEND QT_PLUGIN_LIBRARIES ${QT_PLUGIN_${qlibname}})
+	  else (QT_PLUGIN_${qtlibname})
+        message(FATAL_ERROR "Could not find the Qt plugin ${qlibname} in \"${QT_PLUGINS_DIR}/imageformats\"!")
+      endif (QT_PLUGIN_${qlibname})
+    endforeach(qlibname)
+    # qjpeg depends on libjpeg
+    list(APPEND QT_PLUGIN_LIBRARIES jpeg)
     set(WEBKITLIBPLUGIN OFF CACHE BOOL
         "WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.")
 else (STANDALONE)
@@ -46,7 +58,7 @@ elseif (DARWIN)
         )
 elseif (LINUX)
      if (STANDALONE)
-       set(WEBKIT_PLUGIN_LIBRARIES ${LLQTWEBKIT_LIBRARY} ${QT_LIBRARIES})
+       set(WEBKIT_PLUGIN_LIBRARIES ${LLQTWEBKIT_LIBRARY} ${QT_LIBRARIES} ${QT_PLUGIN_LIBRARIES})
      else (STANDALONE)
        set(WEBKIT_PLUGIN_LIBRARIES
         llqtwebkit
-- 
cgit v1.1