summaryrefslogtreecommitdiff
path: root/indra/test_apps
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-04-16 16:01:32 -0400
committerOz Linden <oz@lindenlab.com>2013-04-16 16:01:32 -0400
commit327c99cadbcbe15442eaee8e0625ade17dcda61f (patch)
tree6d89ba35638ae7e0b439150034a0333b1dc4b397 /indra/test_apps
parente20099155378fd10f7997e36ae8ef150c8c5ad91 (diff)
parentfac6ee27f2d3277494f011271064b0e5e7e02554 (diff)
merge up to 3.5.2 development
Diffstat (limited to 'indra/test_apps')
-rw-r--r--indra/test_apps/llplugintest/CMakeLists.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/test_apps/llplugintest/CMakeLists.txt b/indra/test_apps/llplugintest/CMakeLists.txt
index 1211bb7e5a..8179be66f5 100644
--- a/indra/test_apps/llplugintest/CMakeLists.txt
+++ b/indra/test_apps/llplugintest/CMakeLists.txt
@@ -2,7 +2,7 @@
project(llplugintest)
include(00-Common)
-include(FindOpenGL)
+include(OpenGL)
include(LLCommon)
include(LLPlugin)
include(Linking)
@@ -25,6 +25,9 @@ include_directories(
${LLRENDER_INCLUDE_DIRS}
${LLWINDOW_INCLUDE_DIRS}
)
+include_directories(SYSTEM
+ ${LLCOMMON_SYSTEM_INCLUDE_DIRS}
+ )
if (DARWIN)
include(CMakeFindFrameworks)