2 files changed, 193 insertions, 53 deletions
diff --git a/indra/test_apps/llfbconnecttest/CMakeLists.txt b/indra/test_apps/llfbconnecttest/CMakeLists.txt
index f56329a010..512bf202ae 100644
--- a/indra/test_apps/llfbconnecttest/CMakeLists.txt
+++ b/indra/test_apps/llfbconnecttest/CMakeLists.txt
@@ -122,32 +122,24 @@ add_custom_command(TARGET llfbconnecttest POST_BUILD
 )
 
 
-if (DARWIN OR WINDOWS)
-  get_target_property(BUILT_WEBKIT_PLUGIN media_plugin_webkit LOCATION)
-  add_custom_command(TARGET llfbconnecttest POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy ${BUILT_WEBKIT_PLUGIN}  ${PLUGINS_DESTINATION_DIR}
-    DEPENDS ${BUILT_WEBKIT_PLUGIN}
-  )
-  
-  # copy over bookmarks file if llfbconnecttest gets built
-  get_target_property(BUILT_LLFBCONNECTTEST llfbconnecttest LOCATION)
-  add_custom_command(TARGET llfbconnecttest POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/bookmarks.txt ${CMAKE_CURRENT_BINARY_DIR}/
-    DEPENDS ${BUILT_LLFBCONNECTTEST}
-  )
-  # also copy it to the same place as SLPlugin, which is what the mac wants...
-  add_custom_command(TARGET llfbconnecttest POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/bookmarks.txt ${PLUGINS_DESTINATION_DIR}
-    DEPENDS ${BUILT_LLFBCONNECTTEST}
-  )
-endif (DARWIN OR WINDOWS)
+get_target_property(BUILT_WEBKIT_PLUGIN media_plugin_webkit LOCATION)
+add_custom_command(TARGET llfbconnecttest POST_BUILD
+  COMMAND ${CMAKE_COMMAND} -E copy ${BUILT_WEBKIT_PLUGIN}  ${PLUGINS_DESTINATION_DIR}
+  DEPENDS ${BUILT_WEBKIT_PLUGIN}
+)
 
-if (DARWIN)
-  add_custom_command(TARGET llfbconnecttest POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib ${PLUGINS_DESTINATION_DIR}
-    DEPENDS ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib
-  )
-endif (DARWIN)
+# copy over bookmarks file if llfbconnecttest gets built
+get_target_property(BUILT_LLFBCONNECTTEST llfbconnecttest LOCATION)
+add_custom_command(TARGET llfbconnecttest POST_BUILD
+  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/bookmarks.txt ${CMAKE_CURRENT_BINARY_DIR}/
+  DEPENDS ${BUILT_LLFBCONNECTTEST}
+)
+
+# also copy it to the same place as SLPlugin, which is what the mac wants...
+add_custom_command(TARGET llfbconnecttest POST_BUILD
+  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/bookmarks.txt ${PLUGINS_DESTINATION_DIR}
+  DEPENDS ${BUILT_LLFBCONNECTTEST}
+)
 
 if(WINDOWS)
   #********************
@@ -301,4 +293,80 @@ if(WINDOWS)
 
 endif(WINDOWS)
 
+if (DARWIN)
+  set(fbconnecttest_release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
+  set(fbconnecttest_release_files
+    libexception_handler.dylib
+    libaprutil-1.0.dylib
+    libapr-1.0.dylib
+    libexpat.1.5.2.dylib
+    libQtCore.4.7.1.dylib
+    libQtCore.4.dylib
+    libQtGui.4.7.1.dylib
+    libQtGui.4.dylib
+    libQtNetwork.4.7.1.dylib
+    libQtNetwork.4.dylib
+    libQtOpenGL.4.7.1.dylib
+    libQtOpenGL.4.dylib
+    libQtWebKit.4.7.1.dylib
+    libQtWebKit.4.dylib
+    libQtSvg.4.7.1.dylib
+    libQtSvg.4.dylib
+    libQtXml.4.7.1.dylib
+    libQtXml.4.dylib
+    )
+  copy_if_different(
+    ${fbconnecttest_release_src_dir}
+    "${PLUGINS_DESTINATION_DIR}"
+    out_targets
+    ${fbconnecttest_release_files}
+    )
+  set(fbconnect_test_targets ${fbconnect_test_targets} ${out_targets})
+
+  # Release & ReleaseDebInfo config runtime files required for the FB connect test (Qt image format plugins)
+  set(fbconnecttest_release_src_dir "${ARCH_PREBUILT_DIRS_PLUGINS}/imageformats")
+  set(fbconnecttest_release_files
+    libqgif.dylib
+    libqico.dylib
+    libqjpeg.dylib
+    libqmng.dylib
+    libqsvg.dylib
+    libqtiff.dylib
+    )
+  copy_if_different(
+    ${fbconnecttest_release_src_dir}
+    "${PLUGINS_DESTINATION_DIR}/imageformats"
+    out_targets
+    ${fbconnecttest_release_files}
+    )
+  set(fbconnect_test_targets ${fbconnect_test_targets} ${out_targets})
+
+  # Release & ReleaseDebInfo config runtime files required for the FB connect test (Qt codec plugins)
+  set(fbconnecttest_release_src_dir "${ARCH_PREBUILT_DIRS_PLUGINS}/codecs")
+  set(fbconnecttest_release_files
+    libqcncodecs.dylib
+    libqjpcodecs.dylib
+    libqkrcodecs.dylib
+    libqtwcodecs.dylib
+    )
+  copy_if_different(
+    ${fbconnecttest_release_src_dir}
+    "${PLUGINS_DESTINATION_DIR}/codecs"
+    out_targets
+    ${fbconnecttest_release_files}
+    )
+  set(fbconnect_test_targets ${fbconnect_test_targets} ${out_targets})
+
+  add_custom_target(copy_fbconnecttest_libs ALL
+    DEPENDS 
+    ${fbconnect_test_targets}
+    )
+
+  add_dependencies(llfbconnecttest copy_fbconnecttest_libs)
+endif (DARWIN)
+
+if (LINUX)
+
+endif (LINUX)
+
 ll_deploy_sharedlibs_command(llfbconnecttest) 
diff --git a/indra/test_apps/llplugintest/CMakeLists.txt b/indra/test_apps/llplugintest/CMakeLists.txt
index 8179be66f5..9d44563e26 100755
--- a/indra/test_apps/llplugintest/CMakeLists.txt
+++ b/indra/test_apps/llplugintest/CMakeLists.txt
@@ -346,44 +346,44 @@ add_custom_command(TARGET llmediaplugintest POST_BUILD
   DEPENDS ${BUILT_LLCOMMON}
 )
 
+get_target_property(BUILT_WEBKIT_PLUGIN media_plugin_webkit LOCATION)
+add_custom_command(TARGET llmediaplugintest POST_BUILD
+  COMMAND ${CMAKE_COMMAND} -E copy ${BUILT_WEBKIT_PLUGIN}  ${PLUGINS_DESTINATION_DIR}
+  DEPENDS ${BUILT_WEBKIT_PLUGIN}
+)
 
 if (DARWIN OR WINDOWS)
-  get_target_property(BUILT_WEBKIT_PLUGIN media_plugin_webkit LOCATION)
-  add_custom_command(TARGET llmediaplugintest POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy ${BUILT_WEBKIT_PLUGIN}  ${PLUGINS_DESTINATION_DIR}
-    DEPENDS ${BUILT_WEBKIT_PLUGIN}
-  )
-
   get_target_property(BUILT_QUICKTIME_PLUGIN media_plugin_quicktime LOCATION)
   add_custom_command(TARGET llmediaplugintest POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy ${BUILT_QUICKTIME_PLUGIN}  ${PLUGINS_DESTINATION_DIR}
     DEPENDS ${BUILT_QUICKTIME_PLUGIN}
   )
-  
-  get_target_property(BUILT_EXAMPLE_PLUGIN media_plugin_example LOCATION)
-  add_custom_command(TARGET llmediaplugintest POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy ${BUILT_EXAMPLE_PLUGIN}  ${PLUGINS_DESTINATION_DIR}
-    DEPENDS ${BUILT_EXAMPLE_PLUGIN}
-  )
-  
-  # copy over bookmarks file if llmediaplugintest gets built
-  get_target_property(BUILT_LLMEDIAPLUGINTEST llmediaplugintest LOCATION)
-  add_custom_command(TARGET llmediaplugintest POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/bookmarks.txt ${CMAKE_CURRENT_BINARY_DIR}/
-    DEPENDS ${BUILT_LLMEDIAPLUGINTEST}
-  )
-  # also copy it to the same place as SLPlugin, which is what the mac wants...
-  add_custom_command(TARGET llmediaplugintest POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/bookmarks.txt ${PLUGINS_DESTINATION_DIR}
-    DEPENDS ${BUILT_LLMEDIAPLUGINTEST}
-  )
 endif (DARWIN OR WINDOWS)
 
+get_target_property(BUILT_EXAMPLE_PLUGIN media_plugin_example LOCATION)
+add_custom_command(TARGET llmediaplugintest POST_BUILD
+  COMMAND ${CMAKE_COMMAND} -E copy ${BUILT_EXAMPLE_PLUGIN}  ${PLUGINS_DESTINATION_DIR}
+  DEPENDS ${BUILT_EXAMPLE_PLUGIN}
+)
+
+# copy over bookmarks file if llmediaplugintest gets built
+get_target_property(BUILT_LLMEDIAPLUGINTEST llmediaplugintest LOCATION)
+add_custom_command(TARGET llmediaplugintest POST_BUILD
+  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/bookmarks.txt ${CMAKE_CURRENT_BINARY_DIR}/
+  DEPENDS ${BUILT_LLMEDIAPLUGINTEST}
+)
+
+# also copy it to the same place as SLPlugin, which is what the mac wants...
+add_custom_command(TARGET llmediaplugintest POST_BUILD
+  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/bookmarks.txt ${PLUGINS_DESTINATION_DIR}
+  DEPENDS ${BUILT_LLMEDIAPLUGINTEST}
+)
+
 if (DARWIN)
-  add_custom_command(TARGET llmediaplugintest POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib ${PLUGINS_DESTINATION_DIR}
-    DEPENDS ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib
-  )
+#   add_custom_command(TARGET llmediaplugintest POST_BUILD
+#     COMMAND ${CMAKE_COMMAND} -E copy ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib ${PLUGINS_DESTINATION_DIR}
+#     DEPENDS ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib
+#   )
 endif (DARWIN)
 
 if(WINDOWS)
@@ -538,4 +538,76 @@ if(WINDOWS)
 
 endif(WINDOWS)
 
+if (DARWIN)
+  set(plugintest_release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
+  set(plugintest_release_files
+    libexception_handler.dylib
+    libaprutil-1.0.dylib
+    libapr-1.0.dylib
+    libexpat.1.5.2.dylib
+    libQtCore.4.7.1.dylib
+    libQtCore.4.dylib
+    libQtGui.4.7.1.dylib
+    libQtGui.4.dylib
+    libQtNetwork.4.7.1.dylib
+    libQtNetwork.4.dylib
+    libQtOpenGL.4.7.1.dylib
+    libQtOpenGL.4.dylib
+    libQtWebKit.4.7.1.dylib
+    libQtWebKit.4.dylib
+    libQtSvg.4.7.1.dylib
+    libQtSvg.4.dylib
+    libQtXml.4.7.1.dylib
+    libQtXml.4.dylib
+    )
+  copy_if_different(
+    ${plugintest_release_src_dir}
+    "${PLUGINS_DESTINATION_DIR}"
+    out_targets
+    ${plugintest_release_files}
+    )
+  set(plugin_test_targets ${plugin_test_targets} ${out_targets})
+
+  # Release & ReleaseDebInfo config runtime files required for the FB connect test (Qt image format plugins)
+  set(plugintest_release_src_dir "${ARCH_PREBUILT_DIRS_PLUGINS}/imageformats")
+  set(plugintest_release_files
+    libqgif.dylib
+    libqico.dylib
+    libqjpeg.dylib
+    libqmng.dylib
+    libqsvg.dylib
+    libqtiff.dylib
+    )
+  copy_if_different(
+    ${plugintest_release_src_dir}
+    "${PLUGINS_DESTINATION_DIR}/imageformats"
+    out_targets
+    ${plugintest_release_files}
+    )
+  set(plugin_test_targets ${plugin_test_targets} ${out_targets})
+
+  # Release & ReleaseDebInfo config runtime files required for the FB connect test (Qt codec plugins)
+  set(plugintest_release_src_dir "${ARCH_PREBUILT_DIRS_PLUGINS}/codecs")
+  set(plugintest_release_files
+    libqcncodecs.dylib
+    libqjpcodecs.dylib
+    libqkrcodecs.dylib
+    libqtwcodecs.dylib
+    )
+  copy_if_different(
+    ${plugintest_release_src_dir}
+    "${PLUGINS_DESTINATION_DIR}/codecs"
+    out_targets
+    ${plugintest_release_files}
+    )
+  set(plugin_test_targets ${plugin_test_targets} ${out_targets})
+
+  add_custom_target(copy_plugintest_libs ALL
+    DEPENDS 
+    ${plugin_test_targets}
+    )
+
+  add_dependencies(llmediaplugintest copy_plugintest_libs)
+endif (DARWIN)
+
 ll_deploy_sharedlibs_command(llmediaplugintest)