summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2021-03-11 14:51:13 +0100
committerJoerg Bornemann <joerg.bornemann@qt.io>2021-03-11 16:39:50 +0100
commit081b5398f874d952637c278264c0f80139a8b08b (patch)
treeb7aa98515820628d9702f705fcb34828361b6325 /cmake
parent3d71f1733da5ffed58850d9d4c8697c7a8e549fa (diff)
Remove the -qmake and -cmake configure arguments
Qt is built with CMake since 6.0 and the QMake build system was removed in 6.1. It's time to remove the -cmake and -qmake configure arguments for Qt 6.2. Fixes: QTBUG-88286 Change-Id: Ie726ec364ded025f8d93bd69b469561a6ae40aa9 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/QtProcessConfigureArgs.cmake4
1 files changed, 1 insertions, 3 deletions
diff --git a/cmake/QtProcessConfigureArgs.cmake b/cmake/QtProcessConfigureArgs.cmake
index 70dd5b92e3..1f0007ac45 100644
--- a/cmake/QtProcessConfigureArgs.cmake
+++ b/cmake/QtProcessConfigureArgs.cmake
@@ -53,9 +53,7 @@ unset(device_options)
set_property(GLOBAL PROPERTY UNHANDLED_ARGS "")
while(NOT "${configure_args}" STREQUAL "")
list(POP_FRONT configure_args arg)
- if(arg STREQUAL "-cmake")
- # ignore
- elseif(arg STREQUAL "-cmake-generator")
+ if(arg STREQUAL "-cmake-generator")
list(POP_FRONT configure_args generator)
elseif(arg STREQUAL "-cmake-use-default-generator")
set(auto_detect_generator FALSE)