diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-23 15:56:28 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-23 15:56:28 -0500 |
| commit | b246fdd74827caa7927c0aee64397a764db58df2 (patch) | |
| tree | bd76f7ca0d164a219547725d41ce2bd01b5637d6 /indra/integration_tests | |
| parent | 609c70eb5a48389bef1ad33358774764ee9615e2 (diff) | |
| parent | 0a262969e1da82fc95ec889f7aaafa4078bcf480 (diff) | |
Automated merge with ssh://hg@bitbucket.org/lindenlab/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} |