diff options
author | Oz Linden <oz@lindenlab.com> | 2011-03-19 06:32:13 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-03-19 06:32:13 -0400 |
commit | 5a1b27ba5fbaaa9ee5528b1023a294bc899f7768 (patch) | |
tree | c641bd45e6384c85bff5e43ab01af5cad784283b /indra/integration_tests | |
parent | 1a7369408c0b2cd15dbdc79d045f3347a8ab47d1 (diff) | |
parent | 9693227cb41f909ef66f86e6699ad0bf124a7e83 (diff) |
merge out latest viewer-development
Diffstat (limited to 'indra/integration_tests')
-rw-r--r-- | indra/integration_tests/llui_libtest/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/integration_tests/llui_libtest/CMakeLists.txt b/indra/integration_tests/llui_libtest/CMakeLists.txt index e0772e55ca..df47167154 100644 --- a/indra/integration_tests/llui_libtest/CMakeLists.txt +++ b/indra/integration_tests/llui_libtest/CMakeLists.txt @@ -91,14 +91,14 @@ if (WINDOWS) # Copy over OpenJPEG.dll # *NOTE: On Windows with VS2005, only the first comment prints set(OPENJPEG_RELEASE - "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/openjpeg.dll") + "${ARCH_PREBUILT_DIRS_RELEASE}/openjpeg.dll") add_custom_command( TARGET llui_libtest POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${OPENJPEG_RELEASE} ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Copying OpenJPEG DLLs to binary directory" ) set(OPENJPEG_DEBUG - "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug/openjpegd.dll") + "${ARCH_PREBUILT_DIRS_DEBUG}/openjpegd.dll") add_custom_command( TARGET llui_libtest POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${OPENJPEG_DEBUG} ${CMAKE_CURRENT_BINARY_DIR} |