From d73b06fc3526498a94b46ec6102888556137d08a Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 17 Jan 2019 15:30:56 +0100 Subject: [PATCH] CMake: pro2cmake.py: Fix merging of scopes Set new keys in the parent scope instead of just appending to existing scopes. Change-Id: I901c3f418429d8aed56acb39b1dbe566c5468920 Reviewed-by: Frederik Gladhorn Reviewed-by: Simon Hausmann --- util/cmake/pro2cmake.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index 71664869a4c..6401e52051f 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -213,7 +213,10 @@ class Scope: self._add_child(c) for key in other._operations.keys(): - self._operations[key] = other._operations[key] + if key in self._operations: + self._operations[key] += other._operations[key] + else: + self._operations[key] = other._operations[key] def basedir(self) -> str: return self._basedir