summaryrefslogtreecommitdiff
path: root/indra/integration_tests
diff options
context:
space:
mode:
authorsimon_linden <none@none>2013-09-09 16:17:16 -0700
committersimon_linden <none@none>2013-09-09 16:17:16 -0700
commite2019e8a3b5175eb6d7322fbe7c466f213854640 (patch)
tree1e2fbeaeb249e0f3f0f91e94af213c1840438581 /indra/integration_tests
parent6dd7e0c9ef587c6c05726d407bef8b51018a7a4b (diff)
parent2c1d89c57ec21e4790eb14066d2291282a1000b4 (diff)
Merge downstream code with viewer-release
Diffstat (limited to 'indra/integration_tests')
-rwxr-xr-xindra/integration_tests/llui_libtest/CMakeLists.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/integration_tests/llui_libtest/CMakeLists.txt b/indra/integration_tests/llui_libtest/CMakeLists.txt
index e83b4e8cd7..34e34c7e47 100755
--- a/indra/integration_tests/llui_libtest/CMakeLists.txt
+++ b/indra/integration_tests/llui_libtest/CMakeLists.txt
@@ -60,7 +60,8 @@ add_executable(llui_libtest ${llui_libtest_SOURCE_FILES})
# Link with OS-specific libraries for LLWindow dependency
if (DARWIN)
find_library(COCOA_LIBRARY Cocoa)
- set(OS_LIBRARIES ${COCOA_LIBRARY})
+ find_library(IOKIT_LIBRARY IOKit)
+ set(OS_LIBRARIES ${COCOA_LIBRARY} ${IOKIT_LIBRARY})
elseif (WINDOWS)
#ll_stack_trace needs this now...
list(APPEND WINDOWS_LIBRARIES dbghelp)