From d5580aa7194b84306da52efb189cf126dbaee1f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Thu, 14 Jul 2022 12:12:54 +0200 Subject: [PATCH] cmake: Share most finalizers between macOS and iOS apps The macOS app code path was missing a bunch of finalizers that also makes sense for macOS apps. Pick-to: 6.4 Change-Id: I2b779a1d64086824f43e304f2c7d3b1cd2780070 Reviewed-by: Alexandru Croitor --- src/corelib/Qt6CoreMacros.cmake | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index 0862f48fef2..5ec1ed13593 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -1223,17 +1223,22 @@ function(_qt_internal_generate_ios_info_plist target) set_target_properties("${target}" PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${info_plist_out}") endfunction() -function(_qt_internal_finalize_ios_app target) +function(_qt_internal_finalize_apple_app target) + # Shared between macOS and iOS apps _qt_internal_set_xcode_development_team_id("${target}") _qt_internal_set_xcode_bundle_identifier("${target}") - _qt_internal_set_xcode_targeted_device_family("${target}") _qt_internal_set_xcode_code_sign_style("${target}") _qt_internal_set_xcode_bundle_display_name("${target}") - _qt_internal_set_xcode_bitcode_enablement("${target}") _qt_internal_set_xcode_install_path("${target}") - - _qt_internal_handle_ios_launch_screen("${target}") _qt_internal_set_placeholder_apple_bundle_version("${target}") +endfunction() + +function(_qt_internal_finalize_ios_app target) + _qt_internal_finalize_apple_app("${target}") + + _qt_internal_set_xcode_targeted_device_family("${target}") + _qt_internal_set_xcode_bitcode_enablement("${target}") + _qt_internal_handle_ios_launch_screen("${target}") _qt_internal_generate_ios_info_plist("${target}") endfunction() @@ -1243,6 +1248,8 @@ function(_qt_internal_finalize_macos_app target) return() endif() + _qt_internal_finalize_apple_app("${target}") + # Make sure the install rpath has at least the minimum needed if the app # has any non-static frameworks. We can't rigorously know if the app will # have any, even with a static Qt, so always add this. If there are no @@ -1251,8 +1258,6 @@ function(_qt_internal_finalize_macos_app target) list(APPEND install_rpath "@executable_path/../Frameworks") list(REMOVE_DUPLICATES install_rpath) set_property(TARGET ${target} PROPERTY INSTALL_RPATH "${install_rpath}") - - _qt_internal_set_xcode_install_path("${target}") endfunction() if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS)