diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/CMakeLists.txt | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt index 15561d0..aef0b44 100644 --- a/linden/indra/newview/CMakeLists.txt +++ b/linden/indra/newview/CMakeLists.txt | |||
@@ -1415,6 +1415,8 @@ if (LINUX) | |||
1415 | --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched | 1415 | --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched |
1416 | DEPENDS imprudence-stripped ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py | 1416 | DEPENDS imprudence-stripped ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py |
1417 | ) | 1417 | ) |
1418 | |||
1419 | add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_gstreamer010 media_plugin_webkit) | ||
1418 | 1420 | ||
1419 | if (NOT INSTALL) | 1421 | if (NOT INSTALL) |
1420 | add_custom_target(package ALL DEPENDS ${product}.tar.bz2) | 1422 | add_custom_target(package ALL DEPENDS ${product}.tar.bz2) |
@@ -1452,8 +1454,8 @@ if (DARWIN) | |||
1452 | --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app | 1454 | --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app |
1453 | DEPENDS ${VIEWER_BINARY_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py | 1455 | DEPENDS ${VIEWER_BINARY_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py |
1454 | ) | 1456 | ) |
1455 | 1457 | ||
1456 | add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_gstreamer010 media_plugin_webkit) | 1458 | add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_quicktime media_plugin_webkit) |
1457 | 1459 | ||
1458 | if (PACKAGE) | 1460 | if (PACKAGE) |
1459 | add_custom_target(package ALL DEPENDS ${VIEWER_BINARY_NAME}) | 1461 | add_custom_target(package ALL DEPENDS ${VIEWER_BINARY_NAME}) |
@@ -1473,13 +1475,10 @@ if (DARWIN) | |||
1473 | --build=${CMAKE_CURRENT_BINARY_DIR} | 1475 | --build=${CMAKE_CURRENT_BINARY_DIR} |
1474 | --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app | 1476 | --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app |
1475 | --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched | 1477 | --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched |
1476 | |||
1477 | add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_quicktime media_plugin_webkit) | ||
1478 | DEPENDS | 1478 | DEPENDS |
1479 | ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py | 1479 | ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py |
1480 | ) | 1480 | ) |
1481 | 1481 | ||
1482 | |||
1483 | add_custom_command( | 1482 | add_custom_command( |
1484 | TARGET package POST_BUILD | 1483 | TARGET package POST_BUILD |
1485 | COMMAND ${PYTHON_EXECUTABLE} | 1484 | COMMAND ${PYTHON_EXECUTABLE} |