diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-04-22 16:03:35 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-04-22 16:03:35 -0400 |
| commit | d00d37d23b68037fed8eeeffe21a87f7597086c3 (patch) | |
| tree | 2ce3ca6ce4038ab967277ebba1ca4b8a599c50e5 /indra/cmake/WebKitLibPlugin.cmake | |
| parent | 6c8bddca3d5a790934535fdd6f176e28d181d76a (diff) | |
| parent | 776aadf4ef65681084268c3866058172c89b4259 (diff) | |
merge changes for OPEN-199
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 d9df78bfc8..76f2c148db 100755 --- a/indra/cmake/WebKitLibPlugin.cmake +++ b/indra/cmake/WebKitLibPlugin.cmake @@ -2,7 +2,7 @@ include(Linking) include(Prebuilt) -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}) @@ -28,11 +28,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 |