diff options
author | Oz Linden <oz@lindenlab.com> | 2013-09-09 14:51:34 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-09-09 14:51:34 -0400 |
commit | c4b070ae0011a0c2aa8dd3d01c5f3ad3ecbd3ec3 (patch) | |
tree | d9da12a63dad133b557ff14972844e21dee8dc34 /indra/integration_tests | |
parent | 8dc273b942ca3bae7469dcbaf7bab171b889eea1 (diff) | |
parent | 55ae6a7962cdc9a9d7d087fbc529d30db9c37013 (diff) |
merge changes for 3.6.5-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) |