Merge branch 'sl-base-1.22' into next

Conflicts:
	linden/indra/newview/English.lproj/InfoPlist.strings
	linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml

1 files changed, 5 insertions, 8 deletions

diff --git a/linden/indra/mac_updater/CMakeLists.txt b/linden/indra/mac_updater/CMakeLists.txt
index ef87b29..0eac76f 100644
--- a/linden/indra/mac_updater/CMakeLists.txt
+++ b/linden/indra/mac_updater/CMakeLists.txt
@@ -42,7 +42,6 @@ list(APPEND mac_updater_SOURCE_FILES ${mac_updater_HEADER_FILES})
 
 
 set(mac_updater_RESOURCE_FILES
-  Info.plist
   AutoUpdater.nib/
   )
 set_source_files_properties(
@@ -50,19 +49,18 @@ set_source_files_properties(
   PROPERTIES
   HEADER_FILE_ONLY TRUE
   )
-set_source_files_properties(
-  Info.plist
-  PROPERTIES
-  MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
-  )
 SOURCE_GROUP("Resources" FILES ${mac_updater_RESOURCE_FILES})
 list(APPEND mac_updater_SOURCE_FILES ${mac_updater_RESOURCE_FILES})
 
-
 add_executable(mac-updater
   MACOSX_BUNDLE
   ${mac_updater_SOURCE_FILES})
 
+set_target_properties(mac-updater
+  PROPERTIES
+  MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
+  )
+
 target_link_libraries(mac-updater
     ${LLVFS_LIBRARIES}
     ${CURL_LIBRARIES}
@@ -79,4 +77,3 @@ add_custom_command(
     ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/mac-updater.app/Contents/Resources/AutoUpdater.nib
   )
 
-