diff options
author | simon <none@none> | 2014-07-07 16:17:53 -0700 |
---|---|---|
committer | simon <none@none> | 2014-07-07 16:17:53 -0700 |
commit | bfa42c9e28075cb35f80e6fce7d1db0443027052 (patch) | |
tree | b4e209e91cd173473f3c2033487647c5eb8c6b5d /indra/cmake/WebKitLibPlugin.cmake | |
parent | 114f7b5d0f46dfcbc9a94c1907e396b6e02700f6 (diff) | |
parent | 3e6698073cedc8b24068147cf6b7091f081ea125 (diff) |
Merge downstream code and become 3.7.12
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 |