Fix CMake extraction of sub architecture test
The length check is hard coded to the length of the string under test. As the STRINGS match only filters out non printable characters, we've no guarantee that the characters before the == position are printable or not. So _pos may be > 1 and then string length check will be broken. Replaced this by a pattern match to see whether there's something after the ":". Fixes: QTBUG-120125 Pick-to: 6.5 6.6 6.7 Change-Id: I24971b3bc83ea05841dae21667fbbae3416cfcf9 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
parent
f3fb89ba29
commit
e7457ff171
@ -73,7 +73,7 @@ function(qt_run_config_test_architecture)
|
||||
string(SUBSTRING "${_line}" ${_pos} -1 _architecture)
|
||||
endif()
|
||||
string(FIND "${_line}" "==Qt=magic=Qt== Sub-architecture:" _pos)
|
||||
if (_pos GREATER -1 AND ${lineLength} GREATER 33)
|
||||
if (_pos GREATER -1 AND NOT _line MATCHES "Sub-architecture:$")
|
||||
math(EXPR _pos "${_pos}+34")
|
||||
string(SUBSTRING "${_line}" ${_pos} -1 _sub_architecture)
|
||||
string(REPLACE " " ";" _sub_architecture "${_sub_architecture}")
|
||||
|
Loading…
x
Reference in New Issue
Block a user