From d312580a0539266bfd134bea50090d211eee6e1f Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Wed, 11 Nov 2020 17:19:22 +0100 Subject: [PATCH] CMake: Add special processing of opengl configure option Since feature evaluation expects explicit 'no' value for INPUT_opengl to disable either desktop or es2 opengl support, add special processing for -no-opengl option into QtProcessConfigureArgs.cmake Task-number: QTBUG-88142 Change-Id: Ib49123ee3e9f98035f6ec85a182382559f4db478 Reviewed-by: Alexandru Croitor --- cmake/QtProcessConfigureArgs.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmake/QtProcessConfigureArgs.cmake b/cmake/QtProcessConfigureArgs.cmake index e861fd9a07f..b4494c86459 100644 --- a/cmake/QtProcessConfigureArgs.cmake +++ b/cmake/QtProcessConfigureArgs.cmake @@ -727,6 +727,11 @@ if("${INPUT_ltcg}" STREQUAL "yes") endforeach() endif() +if(NOT "${INPUT_opengl}" STREQUAL "") + drop_input(opengl) + push("-DINPUT_opengl=${INPUT_opengl}") +endif() + translate_list_input(device-option QT_QMAKE_DEVICE_OPTIONS) translate_list_input(defines QT_EXTRA_DEFINES) translate_list_input(fpaths QT_EXTRA_FRAMEWORKPATHS)