summaryrefslogtreecommitdiff
path: root/indra/media_plugins/base
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-04-12 12:10:24 -0400
committerOz Linden <oz@lindenlab.com>2013-04-12 12:10:24 -0400
commitedf5b6a8b71d9c4c01ce9c975864d4525cd7350c (patch)
tree68310a6824451c8c6f3af8ef73f2f9ec17c3a467 /indra/media_plugins/base
parent01fb17cbc5a1d6a3526c4115787dbae74f7bdb07 (diff)
parent460c81070e5fa1c51ce7e186a9ecb8c5f1c995e1 (diff)
pull changes for Sunshine beta
Diffstat (limited to 'indra/media_plugins/base')
-rw-r--r--indra/media_plugins/base/CMakeLists.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/media_plugins/base/CMakeLists.txt b/indra/media_plugins/base/CMakeLists.txt
index 3ad94b0c64..7367b9e5e6 100644
--- a/indra/media_plugins/base/CMakeLists.txt
+++ b/indra/media_plugins/base/CMakeLists.txt
@@ -11,7 +11,7 @@ include(LLRender)
include(LLWindow)
include(Linking)
include(PluginAPI)
-include(FindOpenGL)
+include(OpenGL)
include_directories(
${LLPLUGIN_INCLUDE_DIRS}
@@ -21,6 +21,9 @@ include_directories(
${LLRENDER_INCLUDE_DIRS}
${LLWINDOW_INCLUDE_DIRS}
)
+include_directories(SYSTEM
+ ${LLCOMMON_SYSTEM_INCLUDE_DIRS}
+ )
### media_plugin_base