diff options
| author | Samuel Kolb <skolb@lindenlab.com> | 2009-12-15 13:05:47 -0800 |
|---|---|---|
| committer | Samuel Kolb <skolb@lindenlab.com> | 2009-12-15 13:05:47 -0800 |
| commit | d7533a2c0646826088d5c1f58c84604c0607b8aa (patch) | |
| tree | ebf6447c389e816772e546934cc6972f5750ea60 | |
| parent | c2554b6f286e1bb8fa85ba68d2de56ccc88291b8 (diff) | |
| parent | 1f7bf9216869682aa88c9c92b6c15d2d5278902d (diff) | |
merge
| -rw-r--r-- | indra/test_apps/llplugintest/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | install.xml | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/indra/test_apps/llplugintest/CMakeLists.txt b/indra/test_apps/llplugintest/CMakeLists.txt index 0011daaec6..20ae1be1a2 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 diff --git a/install.xml b/install.xml index 2d60f07c11..8f56811634 100644 --- a/install.xml +++ b/install.xml @@ -948,9 +948,9 @@ anguage Infrstructure (CLI) international standard</string> <key>darwin</key> <map> <key>md5sum</key> - <string>7f818f13faf7c02838fe66f7d27e1913</string> + <string>e854fd009feeeb617ecfa68f7614ec17</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-darwin-20091124.tar.bz2</uri> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.6+flash-darwin-20091215.tar.bz2</uri> </map> <key>linux</key> <map> |