diff options
| author | Albert Astals Cid <albert.astals.cid@kdab.com> | 2019-02-15 15:50:24 +0100 |
|---|---|---|
| committer | Albert Astals Cid <albert.astals.cid@kdab.com> | 2019-02-27 15:04:48 +0000 |
| commit | e03596c2a7d7a3d4b62c90170175fc61957776a9 (patch) | |
| tree | 9a6232fa41ec68ea7c3bab27c85f7a35541689cc /util | |
| parent | a25f9a15076782154bf7cf58e3c5af29a7b6653e (diff) | |
pro2cmake: account for child .pro files having includes
Change-Id: Ic2213578c9bd27787ae9788acbe4455252a1158c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/cmake/pro2cmake.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index 149da8e76d..5537ba38dc 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -678,7 +678,8 @@ def handle_subdir(scope: Scope, cm_fh: typing.IO[str], *, subdir_result.asDict().get('statements'), '', scope.basedir) - cmakeify_scope(subdir_scope, cm_fh, indent=indent + 1) + do_include(subdir_scope) + cmakeify_scope(subdir_scope, cm_fh, indent=indent) elif sd.startswith('-'): cm_fh.write('{}### remove_subdirectory' '("{}")\n'.format(ind, sd[1:])) |