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

pro2cmake: Recursively expand $$FOO variables

Browse Source 
Given HEADERS = $$PUBLIC_HEADERS $$PRIVATE_HEADERS
$$PUBLIC_HEADERS can be expanded into a list of source files
which in turn contain $$PWD/foo.cpp.
The $$PWD needs to be expanded as well.

This is the case for qtwebsockets/src/websockets/websockets.pro
project.

Change-Id: I3aa14203ee8d177fadd12a7e3212c3250970e0a8
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Alexandru Croitor 2019-09-16 13:54:03 +02:00
parent 4b698b33fd
commit 59b940ff41
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
util/cmake/pro2cmake.py
View File

@ -811,7 +811,12 @@ class Scope(object):
if len(get_result) == 1: if len(get_result) == 1:
result = get_result[0] result = get_result[0]
else: else:
return get_result # Recursively expand each value from the result list
# returned from self.get().
result_list = []
for entry_value in get_result:
result_list += self._expand_value(entry_value)
return result_list
else: else:
replacement = self.get(match.group(1), inherit = True) replacement = self.get(match.group(1), inherit = True)
replacement_str = replacement[0] if replacement else '' replacement_str = replacement[0] if replacement else ''