summaryrefslogtreecommitdiff
path: root/indra/integration_tests/llui_libtest
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-14 15:15:48 -0400
committerOz Linden <oz@lindenlab.com>2011-04-14 15:15:48 -0400
commit572e491acf2d9ca1701ec54df31632cbc9c253c8 (patch)
tree4fa39e7b5263f76a62f73d08a1dc8ab550d4ec05 /indra/integration_tests/llui_libtest
parent71f5c1f5e8bbf6b22776cd7f98aabecc7a48918d (diff)
parentb49446c863644d603ec2e1f86f12d24b1c4375c2 (diff)
pull back tags from viewer-release
Diffstat (limited to 'indra/integration_tests/llui_libtest')
-rw-r--r--indra/integration_tests/llui_libtest/CMakeLists.txt4
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}