diff options
| author | Adam Moss <moss@lindenlab.com> | 2009-08-31 17:16:21 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2009-08-31 17:16:21 +0000 |
| commit | 158946668a75a0dad7b53bc74fd2b6f8f4a4befc (patch) | |
| tree | fdbd74ca881f5dd386c84496e393504c6b7eacb5 /indra/test_apps/llplugintest/CMakeLists.txt | |
| parent | 6dbef5f2a41d5ee974b808b8e863d4f973dfa2c3 (diff) | |
svn merge -r130875:131962 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05_newllqtwebkit
DEV-31438 Rename LLMozLib (Qt/WebKit) to something else - LLQtWebKit
Diffstat (limited to 'indra/test_apps/llplugintest/CMakeLists.txt')
| -rw-r--r-- | indra/test_apps/llplugintest/CMakeLists.txt | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/indra/test_apps/llplugintest/CMakeLists.txt b/indra/test_apps/llplugintest/CMakeLists.txt index dd894087e6..789ead04fe 100644 --- a/indra/test_apps/llplugintest/CMakeLists.txt +++ b/indra/test_apps/llplugintest/CMakeLists.txt @@ -283,10 +283,8 @@ target_link_libraries(llmediaplugintest add_dependencies(llmediaplugintest copy_win_libs SLPlugin - media_plugin_flash_activex media_plugin_quicktime media_plugin_webkit - media_plugin_awesomium ${LLPLUGIN_LIBRARIES} ${LLMESSAGE_LIBRARIES} ${LLCOMMON_LIBRARIES} @@ -321,12 +319,6 @@ if (DARWIN OR WINDOWS) DEPENDS ${BUILT_QUICKTIME_PLUGIN} ) - get_target_property(BUILT_AWESOMIUM_PLUGIN media_plugin_awesomium LOCATION) - add_custom_command(TARGET llmediaplugintest POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${BUILT_AWESOMIUM_PLUGIN} ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/ - DEPENDS ${BUILT_AWESOMIUM_PLUGIN} - ) - # copy over bookmarks file if llmediaplugintest gets built get_target_property(BUILT_LLMEDIAPLUGINTEST llmediaplugintest LOCATION) add_custom_command(TARGET llmediaplugintest POST_BUILD @@ -340,24 +332,10 @@ if (DARWIN OR WINDOWS) ) endif (DARWIN OR WINDOWS) -if (WINDOWS) - get_target_property(BUILT_FLASH_ACTIVEX_PLUGIN media_plugin_flash_activex LOCATION) - add_custom_command(TARGET llmediaplugintest POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${BUILT_FLASH_ACTIVEX_PLUGIN} ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/ - DEPENDS ${BUILT_FLASH_ACTIVEX_PLUGIN} - ) - -endif (WINDOWS) - if (DARWIN) add_custom_command(TARGET llmediaplugintest POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllwebkitlib.dylib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/ - DEPENDS ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllwebkitlib.dylib - ) - - add_custom_command(TARGET llmediaplugintest POST_BUILD - COMMAND rsync -av --delete ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/Awesomium.framework ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/ - DEPENDS ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/Awesomium.framework + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/ + DEPENDS ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib ) endif (DARWIN) |