Put in some changes along sg1.4 dev history.

2010-11-21 04:28:31 +01:00
parent 6866a36a5c
commit d68736da39
182 changed files with 2418 additions and 1151 deletions
--- a/indra/cmake/WebKitLibPlugin.cmake
+++ b/indra/cmake/WebKitLibPlugin.cmake
@@ -3,6 +3,7 @@ include(Linking)
 include(Prebuilt)

 if (STANDALONE)
+    find_package(LLQtWebkit REQUIRED)
    set(WEBKITLIBPLUGIN OFF CACHE BOOL
        "WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.")
 else (STANDALONE)
@@ -35,7 +36,7 @@ elseif (DARWIN)
        )
 elseif (LINUX)
    if (STANDALONE)
-       set(WEBKIT_PLUGIN_LIBRARIES llqtwebkit)
+       set(WEBKIT_PLUGIN_LIBRARIES ${LLQTWEBKIT_LIBRARY})
    else (STANDALONE)
       set(WEBKIT_PLUGIN_LIBRARIES
           llqtwebkit