diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-07-21 14:41:29 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-07-21 14:41:29 -0400 |
| commit | 83d5f20b1cbd29a86090f40b1dcc9236f15ca249 (patch) | |
| tree | 4b709f66c7d6ec9195327c4d0ae9a97b10fc0add /indra/media_plugins | |
| parent | 532433674c9553636af9ea8d433b9da6d6fae587 (diff) | |
| parent | 29bea5a6b94458e23559bdbeaae5a593100533b6 (diff) | |
merge changes for 3.7.12-release
Diffstat (limited to 'indra/media_plugins')
| -rwxr-xr-x | indra/media_plugins/webkit/CMakeLists.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/media_plugins/webkit/CMakeLists.txt b/indra/media_plugins/webkit/CMakeLists.txt index 0c1c3d800e..5a8fe90bdd 100755 --- a/indra/media_plugins/webkit/CMakeLists.txt +++ b/indra/media_plugins/webkit/CMakeLists.txt @@ -121,12 +121,12 @@ if (DARWIN) ) # copy the webkit dylib to the build directory - add_custom_command( - TARGET media_plugin_webkit POST_BUILD -# OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/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 - ) +# add_custom_command( +# TARGET media_plugin_webkit POST_BUILD +# # OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/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) |