From ed4e91ee7f958f6549c9643e49842f8bef27b054 Mon Sep 17 00:00:00 2001 From: Router Gray Date: Thu, 1 Aug 2019 08:48:57 -0500 Subject: [PATCH] [Linux] Cmake fix to not do manifest copy twice when packaging. --- indra/newview/CMakeLists.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index af06cb652..22f5eb610 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1742,13 +1742,12 @@ if (LINUX) ) add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_gstreamer010 basic_plugin_filepicker) - add_custom_target(copy_l_viewer_manifest ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.copy_touched) if (PACKAGE) add_custom_target(llpackage ALL DEPENDS ${product}.tar.xz) - # Make sure we don't run two instances of viewer_manifest.py at the same time. - add_dependencies(llpackage copy_l_viewer_manifest) check_message_template(llpackage) + else (PACKAGE) + add_custom_target(copy_l_viewer_manifest ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.copy_touched) endif (PACKAGE) endif (LINUX)