summaryrefslogtreecommitdiff
path: root/indra/test_apps
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2009-12-16 16:40:06 -0800
committerJames Cook <james@lindenlab.com>2009-12-16 16:40:06 -0800
commit3c06dc4df2d9ee11e7d346f902d34eaee17161a5 (patch)
tree40c5342da322116d093268e0437736f860d62e0d /indra/test_apps
parent4c0d5200bc7a53537f9ee7028e74c1feb4abc52e (diff)
parentc08699f900bf1560f61ea05e44449e90bb02c708 (diff)
Merge
Diffstat (limited to 'indra/test_apps')
-rw-r--r--indra/test_apps/llplugintest/CMakeLists.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/test_apps/llplugintest/CMakeLists.txt b/indra/test_apps/llplugintest/CMakeLists.txt
index 0011daaec6..89e2d8582d 100644
--- a/indra/test_apps/llplugintest/CMakeLists.txt
+++ b/indra/test_apps/llplugintest/CMakeLists.txt
@@ -338,6 +338,13 @@ add_custom_command(TARGET llmediaplugintest POST_BUILD
DEPENDS ${BUILT_SLPLUGIN}
)
+get_target_property(BUILT_LLCOMMON llcommon LOCATION)
+add_custom_command(TARGET llmediaplugintest POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E copy ${BUILT_LLCOMMON} ${PLUGINS_DESTINATION_DIR}
+ DEPENDS ${BUILT_LLCOMMON}
+)
+
+
if (DARWIN OR WINDOWS)
get_target_property(BUILT_WEBKIT_PLUGIN media_plugin_webkit LOCATION)
add_custom_command(TARGET llmediaplugintest POST_BUILD
@@ -435,6 +442,7 @@ if(WINDOWS)
qtnetwork4.dll
qtopengl4.dll
qtwebkit4.dll
+ qtxmlpatterns4.dll
ssleay32.dll
)
copy_if_different(