diff options
| author | David Parks <davep@lindenlab.com> | 2009-09-22 11:11:45 +0000 |
|---|---|---|
| committer | David Parks <davep@lindenlab.com> | 2009-09-22 11:11:45 +0000 |
| commit | 536e38ad51b89808f26d8e3cd107fe093862d22a (patch) | |
| tree | 230159ae9e319f5c419f1a643177b2bbb17d52c5 /indra/integration_tests | |
| parent | 760adead96e62cab8f9cdacc6469773a87dfbc1a (diff) | |
Merging render-pipeline-6-qa-2 into viewer-2
Self reviewed.
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 |