diff options
| author | Don Kjer <don@lindenlab.com> | 2011-04-01 23:37:30 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-04-01 23:37:30 +0000 |
| commit | d292053c04e6adfd48be0484dd5a8a07b48e0541 (patch) | |
| tree | bb8814069df178e2bcae041f2c3e9b11338492db /indra/integration_tests/llui_libtest | |
| parent | f2bb81d17660054697ed984afc0e3f8d90f77eda (diff) | |
| parent | 1664c9dc678f7aca9c2bbf38d28e00550e03c4dd (diff) | |
Merge with viewer-development
Diffstat (limited to 'indra/integration_tests/llui_libtest')
| -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} |