From 562fb69d75c48f6d116134537ff502ddbc12e763 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Tue, 29 Dec 2020 14:35:25 +0100 Subject: [PATCH] CMake: Add proactive check of generator multi-config capabilities Add explicit error, if multi-config build is requested, but selected generator doesn't support it. Fixes: QTBUG-88287 Change-Id: I6dba589bb59ad69fa07221c657df272ec75c359b Reviewed-by: Joerg Bornemann (cherry picked from commit 52e1603e33db9ef29fe1eff8c689d38166d393f1) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtProcessConfigureArgs.cmake | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/cmake/QtProcessConfigureArgs.cmake b/cmake/QtProcessConfigureArgs.cmake index 021b2abdefb..228d2060da5 100644 --- a/cmake/QtProcessConfigureArgs.cmake +++ b/cmake/QtProcessConfigureArgs.cmake @@ -774,6 +774,16 @@ if(NOT generator AND auto_detect_generator) endif() endif() endif() + +if(multi_config + AND NOT "${generator}" STREQUAL "Xcode" + AND NOT "${generator}" STREQUAL "Ninja Multi-Config" + AND NOT "${generator}" MATCHES "^Visual Studio") + message(FATAL_ERROR "Multi-config build is only supported by Xcode, Ninja Multi-Config and \ +Visual Studio generators. Current generator is \"${generator}\". +Note: Use '-cmake-generator ' option to specify the generator manually.") +endif() + if(generator) push(-G "${generator}") endif()