diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-11-01 10:59:53 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-11-01 22:32:01 +0100 |
| commit | 6ab16d52d282b1a370cda3f0cf0827142250ac29 (patch) | |
| tree | 7bee9ebd5c70d27bda1e2e1a3a1da28a66c941dd /cmake | |
| parent | a9d8794cf0be617d9eedbf9bb0d6d5401735d6f2 (diff) | |
configure: Remove unused facility to define variable assignments
The function qt_commandline_assignment and everything related to it is
removed from configure. It was only used in qtbase, and all usage has
been removed.
More general variable assignments will be added in a subsequent commit.
Task-number: QTBUG-88210
Change-Id: I7cfa782e89914f2b0dc0277c46e425c8a825557e
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtProcessConfigureArgs.cmake | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/cmake/QtProcessConfigureArgs.cmake b/cmake/QtProcessConfigureArgs.cmake index 6cb17c4e7d..90371ae419 100644 --- a/cmake/QtProcessConfigureArgs.cmake +++ b/cmake/QtProcessConfigureArgs.cmake @@ -160,7 +160,6 @@ defstub(qt_set01) unset(commandline_known_options) unset(commandline_custom_handlers) set(commandline_nr_of_prefixes 0) -set(commandline_nr_of_assignments 0) macro(qt_commandline_subconfig subconfig) list(APPEND commandline_subconfigs "${subconfig}") @@ -198,13 +197,6 @@ function(qt_commandline_prefix arg var) set(commandline_nr_of_prefixes ${n} PARENT_SCOPE) endfunction() -function(qt_commandline_assignment var internal_var) - set(idx ${commandline_nr_of_assignments}) - set(commandline_assignment_${idx} "${var}" "${internal_var}" PARENT_SCOPE) - math(EXPR n "${commandline_nr_of_assignments} + 1") - set(commandline_nr_of_assignments ${n} PARENT_SCOPE) -endfunction() - # Check the following variable in configure.cmake files to guard code that is not covered by the # stub functions above. set(QT_CONFIGURE_RUNNING ON) @@ -569,27 +561,6 @@ while(1) continue() endif() - if(arg MATCHES "^([A-Z0-9_]+)=(.*)") - set(lhs "${CMAKE_MATCH_1}") - set(rhs "${CMAKE_MATCH_2}") - math(EXPR n "${commandline_nr_of_assignments} - 1") - foreach(i RANGE ${n}) - list(GET commandline_assignment_${i} 0 var) - list(GET commandline_assignment_${i} 1 internal_var) - if(lhs STREQUAL var) - set(handled TRUE) - qtConfCommandlineSetInput("${internal_var}" "${rhs}") - break() - endif() - endforeach() - if(NOT handled) - message(FATAL_ERROR "Assigning unknown variable '${lhs}' on command line.") - endif() - endif() - if(handled) - continue() - endif() - # parse out opt and val set(nextok FALSE) if(arg MATCHES "^--?enable-(.*)") |