From 3c148323c08cff1487211c18beda90ae2c6ef508 Mon Sep 17 00:00:00 2001
From: Martin Vejdarski <martin@scenegroup.co>
Date: Mon, 12 Jul 2021 20:27:22 +0300
Subject: [PATCH] CMake: Exclude dSYM INSTALL commands for already excluded
 tools in debug

Debug tools are excluded from the ALL target for debug_and_release
builds. However, when using the -separate-debug-info option, the same
exclusion wasn't being applied for their dSYM INSTALL commands,
resulting in a CMake install error.

Pass any additional install args like

  EXCLUDE_FROM_ALL COMPONENT "ExcludedExecutables"

to the installation rules of qt_enable_separate_debug_info and
install dSYMs for executables per-config in a multi-config build.

All the non-main config executable install rules are optional because
the non-main config executables are excluded from ALL.

Amends 5b136abd21803988f96b9b66c992822efbef97ec

Pick-to: 6.2
Fixes: QTBUG-93999
Change-Id: I95c3ce28215c3ee535551e4b7a5fa9731f8f1c28
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 cmake/QtExecutableHelpers.cmake |  9 ++++++++-
 cmake/QtSeparateDebugInfo.cmake | 27 ++++++++++++++++++++++++++-
 cmake/QtToolHelpers.cmake       |  2 +-
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/cmake/QtExecutableHelpers.cmake b/cmake/QtExecutableHelpers.cmake
index e7dff8522b..5e1f1ca28f 100644
--- a/cmake/QtExecutableHelpers.cmake
+++ b/cmake/QtExecutableHelpers.cmake
@@ -167,7 +167,14 @@ function(qt_internal_add_executable name)
                        ${install_targets_default_args})
         endforeach()
 
-        qt_enable_separate_debug_info(${name} "${arg_INSTALL_DIRECTORY}")
+        if(NOT exclude_from_all AND arg_QT_APP AND QT_FEATURE_debug_and_release)
+            set(separate_debug_info_executable_arg "QT_EXECUTABLE")
+        else()
+            unset(separate_debug_info_executable_arg)
+        endif()
+        qt_enable_separate_debug_info(${name} "${arg_INSTALL_DIRECTORY}"
+                                      ${separate_debug_info_executable_arg}
+                                      ADDITIONAL_INSTALL_ARGS ${additional_install_args})
         qt_internal_install_pdb_files(${name} "${arg_INSTALL_DIRECTORY}")
     endif()
 
diff --git a/cmake/QtSeparateDebugInfo.cmake b/cmake/QtSeparateDebugInfo.cmake
index c31d618d00..00ac4519fe 100644
--- a/cmake/QtSeparateDebugInfo.cmake
+++ b/cmake/QtSeparateDebugInfo.cmake
@@ -6,6 +6,11 @@ endif()
 
 # Enable separate debug information for the given target
 function(qt_enable_separate_debug_info target installDestination)
+    set(flags QT_EXECUTABLE)
+    set(options)
+    set(multiopts ADDITIONAL_INSTALL_ARGS)
+    cmake_parse_arguments(arg "${flags}" "${options}" "${multiopts}" ${ARGN})
+
     if (NOT QT_FEATURE_separate_debug_info)
         return()
     endif()
@@ -66,7 +71,27 @@ function(qt_enable_separate_debug_info target installDestination)
             COMMAND ${CMAKE_COMMAND} -E copy "Info.dSYM.plist" "${debug_info_contents_dir}/Info.plist"
             )
         set(debug_info_target "${debug_info_target_dir}/$<TARGET_FILE_BASE_NAME:${target}>")
-        qt_install(DIRECTORY ${debug_info_bundle_dir} DESTINATION ${installDestination})
+
+        if(arg_QT_EXECUTABLE AND QT_FEATURE_debug_and_release)
+            qt_get_cmake_configurations(cmake_configs)
+            foreach(cmake_config ${cmake_configs})
+                # Make installation optional for targets that are not built by default in this config
+                if(NOT (cmake_config STREQUAL QT_MULTI_CONFIG_FIRST_CONFIG))
+                    set(install_optional_arg OPTIONAL)
+                  else()
+                    unset(install_optional_arg)
+                endif()
+                qt_install(DIRECTORY ${debug_info_bundle_dir}
+                           ${arg_ADDITIONAL_INSTALL_ARGS}
+                           ${install_optional_arg}
+                           CONFIGURATIONS ${cmake_config}
+                           DESTINATION ${installDestination})
+            endforeach()
+        else()
+            qt_install(DIRECTORY ${debug_info_bundle_dir}
+                       ${arg_ADDITIONAL_INSTALL_ARGS}
+                       DESTINATION ${installDestination})
+        endif()
     else()
         set(debug_info_target "$<TARGET_FILE_DIR:${target}>/$<TARGET_FILE_BASE_NAME:${target}>.${debug_info_suffix}")
         qt_install(FILES ${debug_info_target} DESTINATION ${installDestination})
diff --git a/cmake/QtToolHelpers.cmake b/cmake/QtToolHelpers.cmake
index c1b6b0cdbf..77dae50027 100644
--- a/cmake/QtToolHelpers.cmake
+++ b/cmake/QtToolHelpers.cmake
@@ -257,7 +257,7 @@ function(qt_internal_add_tool target_name)
 
     endif()
 
-    qt_enable_separate_debug_info(${target_name} "${install_dir}")
+    qt_enable_separate_debug_info(${target_name} "${install_dir}" QT_EXECUTABLE)
     qt_internal_install_pdb_files(${target_name} "${install_dir}")
 endfunction()