summaryrefslogtreecommitdiff
path: root/indra/media_plugins/webkit
diff options
context:
space:
mode:
authordolphin <dolphin@lindenlab.com>2013-04-04 17:10:28 -0700
committerdolphin <dolphin@lindenlab.com>2013-04-04 17:10:28 -0700
commit56badfe3498b5eeefb5c06c4b0d51eb1c62ded9c (patch)
treec1b61940e39d615201e18259bcab1762c5a8c655 /indra/media_plugins/webkit
parentf684d897f532bcba87cda1f72bd19efac82f6cb6 (diff)
parent460c81070e5fa1c51ce7e186a9ecb8c5f1c995e1 (diff)
Merge with viewer-development
Diffstat (limited to 'indra/media_plugins/webkit')
-rw-r--r--indra/media_plugins/webkit/CMakeLists.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/media_plugins/webkit/CMakeLists.txt b/indra/media_plugins/webkit/CMakeLists.txt
index b36291f0e8..0c1c3d800e 100644
--- a/indra/media_plugins/webkit/CMakeLists.txt
+++ b/indra/media_plugins/webkit/CMakeLists.txt
@@ -13,7 +13,7 @@ include(UI)
include(Linking)
include(PluginAPI)
include(MediaPluginBase)
-include(FindOpenGL)
+include(OpenGL)
include(PulseAudio)
include(WebKitLibPlugin)
@@ -29,6 +29,9 @@ include_directories(
${LLWINDOW_INCLUDE_DIRS}
${LLQTWEBKIT_INCLUDE_DIR}
)
+include_directories(SYSTEM
+ ${LLCOMMON_SYSTEM_INCLUDE_DIRS}
+ )
### media_plugin_webkit