diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-05-02 17:42:14 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-05-02 17:57:11 +0300 |
| commit | ade8c96e5c68f672d33802f4a82ce46ccffd7816 (patch) | |
| tree | 0f8c75d3657ce11c38a8d98b081b3b08b64de104 /indra/integration_tests/llui_libtest | |
| parent | 002ff88a130b16f03e26e159f7ea5f38782b16b6 (diff) | |
| parent | 7ed52090a67882cd0bc904f1e0a9ce07cf6768e9 (diff) | |
Merge branch 'main' into DRTVWR-567
# Conflicts:
# indra/newview/llappviewer.cpp
Diffstat (limited to 'indra/integration_tests/llui_libtest')
| -rw-r--r-- | indra/integration_tests/llui_libtest/CMakeLists.txt | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/indra/integration_tests/llui_libtest/CMakeLists.txt b/indra/integration_tests/llui_libtest/CMakeLists.txt index d603e57aab..a6ce657f4f 100644 --- a/indra/integration_tests/llui_libtest/CMakeLists.txt +++ b/indra/integration_tests/llui_libtest/CMakeLists.txt @@ -58,19 +58,12 @@ if (WINDOWS) # Copy over OpenJPEG.dll # *NOTE: On Windows with VS2005, only the first comment prints set(OPENJPEG_RELEASE - "${ARCH_PREBUILT_DIRS_RELEASE}/openjp2.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 - "${ARCH_PREBUILT_DIRS_DEBUG}/openjp2.dll") - add_custom_command( TARGET llui_libtest POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${OPENJPEG_DEBUG} ${CMAKE_CURRENT_BINARY_DIR} - ) - + COMMENT "Copying OpenJPEG DLLs to binary directory" + ) endif (WINDOWS) # Ensure people working on the viewer don't break this library |