diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-11-06 21:48:08 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-11-10 04:24:28 +0100 |
| commit | 5b136abd21803988f96b9b66c992822efbef97ec (patch) | |
| tree | b5266a5ba068f93bf57dc78ba744535dd6630a3f /cmake/QtBuild.cmake | |
| parent | b8b75cdcfa71189c7726607be7b66d0ddeaae372 (diff) | |
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>
Diffstat (limited to 'cmake/QtBuild.cmake')
| -rw-r--r-- | cmake/QtBuild.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 052f5ea3de..5fc98f033c 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -445,7 +445,7 @@ set(__qt_add_plugin_multi_args # Collection of arguments so they can be shared across qt_internal_add_executable # and qt_internal_add_test_helper. set(__qt_internal_add_executable_optional_args - "GUI;BOOTSTRAP;NO_QT;NO_INSTALL;EXCEPTIONS;DELAY_RC;DELAY_TARGET_INFO" + "GUI;BOOTSTRAP;NO_QT;NO_INSTALL;EXCEPTIONS;DELAY_RC;DELAY_TARGET_INFO;QT_APP" ) set(__qt_internal_add_executable_single_args "OUTPUT_DIRECTORY;INSTALL_DIRECTORY;VERSION" |