diff options
author | Oz Linden <oz@lindenlab.com> | 2013-10-23 13:05:59 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-10-23 13:05:59 -0400 |
commit | c9775dde6249582f0e8976be15e72bfebc4ac3fc (patch) | |
tree | 83407157dae234db649dfff763e68f6e3c843335 /indra/integration_tests | |
parent | 1a72325ef1e8c798066d8ef7f82acd08d60fb68c (diff) | |
parent | ea1e1b0925b386cf83178539b8eae9e25c573548 (diff) |
merge up to 3.6.9-release
Diffstat (limited to 'indra/integration_tests')
-rwxr-xr-x | indra/integration_tests/llui_libtest/CMakeLists.txt | 3 |
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) |