From 5b136abd21803988f96b9b66c992822efbef97ec Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Fri, 6 Nov 2020 21:48:08 +0100
Subject: CMake: Fix installation errors in multi-config build

In multi-config builds (which equals the debug-and-release feature) we
exclude tools of the non-main configurations from the default build.
But we still create installation rules for them.  Mark those as optional
to avoid "cmake --install" yielding errors if those tools weren't built.

Fixes: QTBUG-85411
Change-Id: Ic2d3897d1a1c28a715d9a024ec8606fff00e0315
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 cmake/QtAppHelpers.cmake | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'cmake/QtAppHelpers.cmake')

diff --git a/cmake/QtAppHelpers.cmake b/cmake/QtAppHelpers.cmake
index e7f96b8c52..ff32be0b89 100644
--- a/cmake/QtAppHelpers.cmake
+++ b/cmake/QtAppHelpers.cmake
@@ -16,6 +16,7 @@ function(qt_internal_add_app target)
     endif()
 
     qt_internal_add_executable("${target}"
+        QT_APP
         DELAY_RC
         DELAY_TARGET_INFO
         OUTPUT_DIRECTORY "${output_directory}"
@@ -48,11 +49,6 @@ function(qt_internal_add_app target)
     # if CONFIG += console was encountered during conversion.
     set_target_properties("${target}" PROPERTIES WIN32_EXECUTABLE TRUE)
 
-    if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.19.0" AND QT_FEATURE_debug_and_release)
-        set_property(TARGET "${target}"
-            PROPERTY EXCLUDE_FROM_ALL "$<NOT:$<CONFIG:${QT_MULTI_CONFIG_FIRST_CONFIG}>>")
-    endif()
-
     qt_add_list_file_finalizer(qt_internal_finalize_app ${target})
 endfunction()
 
-- 
cgit v1.2.1