summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2021-11-01 10:59:53 +0100
committerJoerg Bornemann <joerg.bornemann@qt.io>2021-11-01 22:32:01 +0100
commit6ab16d52d282b1a370cda3f0cf0827142250ac29 (patch)
tree7bee9ebd5c70d27bda1e2e1a3a1da28a66c941dd
parenta9d8794cf0be617d9eedbf9bb0d6d5401735d6f2 (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>
-rw-r--r--cmake/QtProcessConfigureArgs.cmake29
-rwxr-xr-xutil/cmake/configurejson2cmake.py8
2 files changed, 1 insertions, 36 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-(.*)")
diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py
index 3be7118080..d177ba3fe4 100755
--- a/util/cmake/configurejson2cmake.py
+++ b/util/cmake/configurejson2cmake.py
@@ -1413,11 +1413,6 @@ def parseCommandLinePrefixes(ctx, data, cm_fh):
cm_fh.write(f"qt_commandline_prefix({key} {data[key]})\n")
-def parseCommandLineAssignments(ctx, data, cm_fh):
- for key in data:
- cm_fh.write(f"qt_commandline_assignment({key} {data[key]})\n")
-
-
def processCommandLine(ctx, data, cm_fh):
print(" commandline:")
@@ -1439,8 +1434,7 @@ def processCommandLine(ctx, data, cm_fh):
print(" prefix:")
parseCommandLinePrefixes(ctx, commandLine["prefix"], cm_fh)
if "assignments" in commandLine:
- print(" assignments:")
- parseCommandLineAssignments(ctx, commandLine["assignments"], cm_fh)
+ print(" assignments are ignored")
def processInputs(ctx, data, cm_fh):