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

Handle empty contents for condition scopes in examples

Browse Source 
Only print condition scopes when there is something to print.

Change-Id: I24151ca4834317940712b6173046abe91aac5628
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Leander Beernaert 2019-10-11 16:43:29 +02:00
parent b6e75ff3ea
commit d62a2797ae
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
util/cmake/pro2cmake.py
View File

@ -2768,62 +2768,70 @@ def write_example(
write_wayland_part(cm_fh, binary_name, scope, indent=0) write_wayland_part(cm_fh, binary_name, scope, indent=0)
# The following options do not # The following options do not
io_string = io.StringIO()
condition_str = ""
condition = "ON" condition = "ON"
if scope.total_condition: if scope.total_condition:
condition = map_to_cmake_condition(scope.total_condition) condition = map_to_cmake_condition(scope.total_condition)
if condition != "ON": if condition != "ON":
cm_fh.write(f"\n{spaces(indent)}if({condition})\n") condition_str = f"\n{spaces(indent)}if({condition})\n"
indent += 1 indent += 1
if not handling_first_scope: if not handling_first_scope:
target_sources = f"target_sources({binary_name} PUBLIC" target_sources = f"target_sources({binary_name} PUBLIC"
write_all_source_file_lists(cm_fh, scope, target_sources, indent=indent, footer=")\n") write_all_source_file_lists(io_string, scope, target_sources, indent=indent, footer=")\n")
write_include_paths( write_include_paths(
cm_fh, io_string,
scope, scope,
f"target_include_directories({binary_name} PUBLIC", f"target_include_directories({binary_name} PUBLIC",
indent=indent, indent=indent,
footer=")", footer=")\n",
) )
write_defines( write_defines(
cm_fh, io_string,
scope, scope,
f"target_compile_definitions({binary_name} PUBLIC", f"target_compile_definitions({binary_name} PUBLIC",
indent=indent, indent=indent,
footer=")", footer=")\n",
) )
(scope_public_libs, scope_private_libs) = extract_cmake_libraries(scope, is_example=True) (scope_public_libs, scope_private_libs) = extract_cmake_libraries(scope, is_example=True)
write_list( write_list(
cm_fh, io_string,
scope_private_libs, scope_private_libs,
"", "",
indent=indent, indent=indent,
header=f"target_link_libraries({binary_name} PRIVATE\n", header=f"target_link_libraries({binary_name} PRIVATE\n",
footer=")", footer=")\n",
) )
write_list( write_list(
cm_fh, io_string,
scope_public_libs, scope_public_libs,
"", "",
indent=indent, indent=indent,
header=f"target_link_libraries({binary_name} PUBLIC\n", header=f"target_link_libraries({binary_name} PUBLIC\n",
footer=")", footer=")\n",
) )
write_compile_options( write_compile_options(
cm_fh, scope, f"target_compile_options({binary_name}", indent=indent, footer=")" io_string, scope, f"target_compile_options({binary_name}", indent=indent, footer=")\n"
) )
write_resources(cm_fh, binary_name, scope, indent=indent, is_example=True) write_resources(io_string, binary_name, scope, indent=indent, is_example=True)
write_statecharts(cm_fh, binary_name, scope, indent=indent, is_example=True) write_statecharts(io_string, binary_name, scope, indent=indent, is_example=True)
write_repc_files(cm_fh, binary_name, scope, indent=indent) write_repc_files(io_string, binary_name, scope, indent=indent)
if condition != "ON": if condition != "ON":
indent -= 1 indent -= 1
cm_fh.write(f"\n{spaces(indent)}endif()\n") string = io_string.getvalue()
if len(string) != 0:
string = string.rstrip("\n")
cm_fh.write(f"{condition_str}{string}\n")
if condition != "ON":
cm_fh.write(f"{spaces(indent)}endif()\n")
handling_first_scope = False handling_first_scope = False
if qmldir: if qmldir: