diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-09-30 21:44:20 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-09-30 21:44:20 -0400 |
| commit | 57969e41db06cbc5c0f9ffdeafb7c21e55b2731d (patch) | |
| tree | ea54edd04380696ef3f83671204fdae2f7ae298e /indra/integration_tests | |
| parent | c4c537e957458650a2948ffbd3a787f007d87f7a (diff) | |
| parent | eca30a22626b9a3e68e0e55f8da75614cd60d713 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/login-api/
Diffstat (limited to 'indra/integration_tests')
| -rw-r--r-- | indra/integration_tests/llui_libtest/CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/integration_tests/llui_libtest/CMakeLists.txt b/indra/integration_tests/llui_libtest/CMakeLists.txt index 84e3477ce6..452d37d3be 100644 --- a/indra/integration_tests/llui_libtest/CMakeLists.txt +++ b/indra/integration_tests/llui_libtest/CMakeLists.txt @@ -57,6 +57,8 @@ if (DARWIN) find_library(COCOA_LIBRARY Cocoa) set(OS_LIBRARIES ${COCOA_LIBRARY}) elseif (WINDOWS) + #ll_stack_trace needs this now... + list(APPEND WINDOWS_LIBRARIES dbghelp) set(OS_LIBRARIES ${WINDOWS_LIBRARIES}) elseif (LINUX) set(OS_LIBRARIES) @@ -95,6 +97,7 @@ if (WINDOWS) COMMAND ${CMAKE_COMMAND} -E copy_if_different ${OPENJPEG_DEBUG} ${CMAKE_CURRENT_BINARY_DIR} ) + endif (WINDOWS) # Ensure people working on the viewer don't break this library |