diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-17 15:15:06 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-17 15:15:06 -0500 |
| commit | 0a262969e1da82fc95ec889f7aaafa4078bcf480 (patch) | |
| tree | 7d76da988c79d3b11fc2fc5e51d5f2c0248abaf0 /indra/integration_tests | |
| parent | 1a79aeca54db6ee5bf1fb2968c2642f8a3306091 (diff) | |
| parent | c1901890576d3b9442846c8890b1724438eab46e (diff) | |
Automated merge with file:///Users/oz/Work/V-DR
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} |