VWR-20815 (SNOW-511) Allow standalone builds to correctly find a system version of llqtwebkit

2010-08-19 18:36:14 +01:00 · 2010-08-19 18:36:14 +01:00 · 29512788ad
parent 6f1d8b1d05
commit 29512788ad
2 changed files with 30 additions and 34 deletions
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@ -524,6 +524,7 @@ Robin Cornelius
 	SNOW-504
 	SNOW-506
 	SNOW-507
+	SNOW-511
 	SNOW-514
 	SNOW-520
 	SNOW-585
--- a/indra/cmake/WebKitLibPlugin.cmake
+++ b/indra/cmake/WebKitLibPlugin.cmake
@ -34,17 +34,15 @@ elseif (DARWIN)
      debug ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib
      )
 elseif (LINUX)
+  if (STANDALONE) 
+    set(WEBKIT_PLUGIN_LIBRARIES llqtwebkit)
+  else (STANDALONE)
    set(WEBKIT_PLUGIN_LIBRARIES
        llqtwebkit

        qgif
-#        qico
        qjpeg
-#        qpng
-#        qtiff
-#        qsvg

-#        QtSvg
        QtWebKit
        QtOpenGL
        QtNetwork
@ -56,9 +54,6 @@ elseif (LINUX)
        X11
        Xrender
        GL
-
-#        sqlite3
-#        Xi
-#        SM
        )
+  endif (STANDALONE)
 endif (WINDOWS)