summaryrefslogtreecommitdiff
path: root/indra/integration_tests
diff options
context:
space:
mode:
authordolphin <dolphin@lindenlab.com>2013-09-09 12:46:20 -0700
committerdolphin <dolphin@lindenlab.com>2013-09-09 12:46:20 -0700
commit07cb32449f601e2d47e83d781af3bb9df2474d5c (patch)
treea913755d041e5ac780c840301ec4676894497e82 /indra/integration_tests
parent51c01f5294b68b66706685346ecea16246b85cce (diff)
parent55ae6a7962cdc9a9d7d087fbc529d30db9c37013 (diff)
Merge with 3.6.5
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)