1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: pro2cmake.py: Fix handling of complex else branches

Browse Source 
Return the current scope's condition, not the total condition from
recursive_evaluate_scope. That is the part the "else" referrs to.

The parent_condition stays identical for all branches, so that should
not get negated.

Change-Id: I0da91483d4d748d01a29ac16890d709d8d659843
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Tobias Hunger 2019-01-22 14:23:59 +01:00
parent 0e2762651c
commit 0a9e5e139a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
util/cmake/pro2cmake.py
View File

@ -718,7 +718,8 @@ def write_ignored_keys(scope: Scope, ignored_keys, indent) -> str:
def recursive_evaluate_scope(scope: Scope, parent_condition: str = '',
previous_condition: str = '') -> str:
total_condition = scope.condition()
current_condition = scope.condition()
total_condition = current_condition
if total_condition == 'else':
assert previous_condition, \
"Else branch without previous condition in: %s" % scope.file()
@ -753,7 +754,7 @@ def recursive_evaluate_scope(scope: Scope, parent_condition: str = '',
prev_condition = recursive_evaluate_scope(c, total_condition,
prev_condition)
return total_condition
return current_condition
def write_extend_target(cm_fh: typing.IO[str], target: str,