diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-11-18 22:16:00 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-11-24 10:47:10 +0100 |
| commit | a756a9aa8b190db6bd6825e6fe8b8bb6c3691e88 (patch) | |
| tree | 89c83e07cf47123395882baed9831d5157f4b798 /qt_cmdline.cmake | |
| parent | 95907f9be4881b4d9c85cd6dc8134f5bf69c10be (diff) | |
configure: Remove vestiges of handling QMAKE_* variable assignments
When qmake and CMake build were both available next to each other, we
answered QMAKE_FOO=bar assignments in the CMake build with an error
message. This code is never triggered these days and can be removed.
Change-Id: Ifd29283b8ddc86b94c4e6cbce9e9252215e9f2fe
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'qt_cmdline.cmake')
| -rw-r--r-- | qt_cmdline.cmake | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/qt_cmdline.cmake b/qt_cmdline.cmake index 6627788a0a..ce9889045c 100644 --- a/qt_cmdline.cmake +++ b/qt_cmdline.cmake @@ -8,7 +8,6 @@ qt_commandline_subconfig(src/printsupport) qt_commandline_subconfig(src/plugins/sqldrivers) qt_commandline_subconfig(src/testlib) qt_commandline_subconfig(src/tools) -qt_commandline_custom(qmakeArgs) qt_commandline_option(prefix TYPE string) qt_commandline_option(extprefix TYPE string) qt_commandline_option(archdatadir TYPE string) @@ -124,18 +123,6 @@ qt_commandline_prefix(L lpaths) qt_commandline_prefix(R rpaths) qt_commandline_prefix(W wflags) -# special case begin -function(qt_commandline_qmakeArgs out_var arg) - if(arg MATCHES "^QMAKE_[A-Z0-9_]+ *[-+]?=.*") - message(FATAL_ERROR - "${arg} is not a valid configure argument. " - "Assignments to QMake variables are not supported. " - "Consider passing the equivalent CMake argument via " - "'configure ... -- -DCMAKE_VARIABLE=VALUE'") - endif() - set(${out_var} FALSE PARENT_SCOPE) -endfunction() - function(qt_commandline_cxxstd arg val nextok) if("${val}" STREQUAL "") qtConfGetNextCommandlineArg(val) @@ -187,4 +174,3 @@ function(qt_commandline_sanitize arg val nextok) qtConfAddError("Invalid argument '${val}' to command line parameter '${arg}'") endif() endfunction() -# special case end |