diff options
author | callum_linden <none@none> | 2014-09-08 12:28:24 -0700 |
---|---|---|
committer | callum_linden <none@none> | 2014-09-08 12:28:24 -0700 |
commit | bd701ca99b7bd31559add2e94e533ee3bc3ff025 (patch) | |
tree | 563d4b63b4c741c15d6767f67c5f9fb2f4f762ba /indra/media_plugins/webkit | |
parent | 77751a15d1dc976d77d41db5b586e18b5311ccb4 (diff) | |
parent | eef4acc5367a486b0c52c6ce5e1aba995fefd99c (diff) |
Merge with head of viewer-release
Diffstat (limited to 'indra/media_plugins/webkit')
-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) |