summaryrefslogtreecommitdiff
path: root/indra/media_plugins
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-21 09:31:49 -0400
committerOz Linden <oz@lindenlab.com>2011-03-21 09:31:49 -0400
commit9d2f08427b6f3643f642e3e599a19a2dce3101e7 (patch)
tree529ff1ed1ac9961ec86f76ec51a6e92e931a64f9 /indra/media_plugins
parentdf63c6931e81c034887611711095e3134b9a7318 (diff)
parent819c7f0dd21b8b819cdc70686682e31cadf155d6 (diff)
pull updates to the start of 2.6.2 from viewer-development
Diffstat (limited to 'indra/media_plugins')
-rw-r--r--indra/media_plugins/webkit/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/media_plugins/webkit/CMakeLists.txt b/indra/media_plugins/webkit/CMakeLists.txt
index 3b1f679540..b36291f0e8 100644
--- a/indra/media_plugins/webkit/CMakeLists.txt
+++ b/indra/media_plugins/webkit/CMakeLists.txt
@@ -121,8 +121,8 @@ if (DARWIN)
add_custom_command(
TARGET media_plugin_webkit POST_BUILD
# OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/libllqtwebkit.dylib
- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/
- DEPENDS media_plugin_webkit ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib
+ COMMAND ${CMAKE_COMMAND} -E copy ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/
+ DEPENDS media_plugin_webkit ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib
)
endif (DARWIN)