diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-07-08 17:29:48 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-07-08 17:29:48 -0400 |
| commit | 29bea5a6b94458e23559bdbeaae5a593100533b6 (patch) | |
| tree | 5bd356450afd8da159542bfd444b653442004a45 /indra/cmake/WebKitLibPlugin.cmake | |
| parent | 053f436413c01e237accabace4dc5ff1eccca837 (diff) | |
| parent | 226929f8f5b8bc1080d0082b2595d689238df2b8 (diff) | |
Merge. Refresh from viewer-release after 3.7.11 release.
Diffstat (limited to 'indra/cmake/WebKitLibPlugin.cmake')
| -rwxr-xr-x | indra/cmake/WebKitLibPlugin.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake index 89f7a6197b..f7c548a2fd 100755 --- a/indra/cmake/WebKitLibPlugin.cmake +++ b/indra/cmake/WebKitLibPlugin.cmake @@ -3,7 +3,7 @@ include(Linking) include(Prebuilt) include(OpenSSL) -if (STANDALONE) +if (USESYSTEMLIBS) # 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 QtWebKit REQUIRED) include(${QT_USE_FILE}) @@ -29,11 +29,11 @@ if (STANDALONE) list(APPEND QT_PLUGIN_LIBRARIES jpeg) set(WEBKITLIBPLUGIN OFF CACHE BOOL "WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.") -else (STANDALONE) +else (USESYSTEMLIBS) use_prebuilt_binary(llqtwebkit) set(WEBKITLIBPLUGIN ON CACHE BOOL "WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.") -endif (STANDALONE) +endif (USESYSTEMLIBS) if (WINDOWS) set(WEBKIT_PLUGIN_LIBRARIES |