diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:19:11 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:19:11 -0400 |
| commit | c77fcfb7a8aeb2f271b050171bf0d6a9bd4c955b (patch) | |
| tree | d30164242aa4af36f721033eb7a93fb2f2198de4 /indra/integration_tests/llui_libtest | |
| parent | f1b1dbaba54ce678e6ec5311d4b50ded3f91d58c (diff) | |
| parent | e0adaa188ba06b6d3f3282121d149193de87c6e6 (diff) | |
merge changes for storm-250
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} |