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

Run blake on pro2cmake.py

Browse Source 
Change-Id: I16cc7058f817d22e2c72fb6d42c472250a7e6cfb
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Leander Beernaert 2019-10-14 11:12:47 +02:00
parent d62a2797ae
commit 665f75f1f1
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
util/cmake/pro2cmake.py
View File

@ -1227,7 +1227,11 @@ def map_condition(condition: str) -> str:
condition = unwrap_if(condition) condition = unwrap_if(condition)
condition = re.sub(r"\bisEmpty\s*\((.*?)\)", r"\1_ISEMPTY", condition) condition = re.sub(r"\bisEmpty\s*\((.*?)\)", r"\1_ISEMPTY", condition)
condition = re.sub(r"\bcontains\s*\(\s*(?:QT_)?CONFIG\s*,\s*c\+\+(\d+)\)", r"cxx_std_\1 IN_LIST CMAKE_CXX_COMPILE_FEATURES", condition) condition = re.sub(
r"\bcontains\s*\(\s*(?:QT_)?CONFIG\s*,\s*c\+\+(\d+)\)",
r"cxx_std_\1 IN_LIST CMAKE_CXX_COMPILE_FEATURES",
condition,
)
condition = re.sub(r'\bcontains\s*\((.*?),\s*"?(.*?)"?\)', r"\1___contains___\2", condition) condition = re.sub(r'\bcontains\s*\((.*?),\s*"?(.*?)"?\)', r"\1___contains___\2", condition)
condition = re.sub(r'\bequals\s*\((.*?),\s*"?(.*?)"?\)', r"\1___equals___\2", condition) condition = re.sub(r'\bequals\s*\((.*?),\s*"?(.*?)"?\)', r"\1___equals___\2", condition)
condition = re.sub(r'\bisEqual\s*\((.*?),\s*"?(.*?)"?\)', r"\1___equals___\2", condition) condition = re.sub(r'\bisEqual\s*\((.*?),\s*"?(.*?)"?\)', r"\1___equals___\2", condition)
@ -2780,7 +2784,9 @@ def write_example(
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(io_string, 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(
io_string, io_string,
@ -2869,7 +2875,7 @@ def write_plugin(cm_fh, scope, *, indent: int = 0) -> str:
if target_path: if target_path:
extra.append(f'INSTALL_DIRECTORY "{target_path}"') extra.append(f'INSTALL_DIRECTORY "{target_path}"')
else: else:
extra.append('SKIP_INSTALL') extra.append("SKIP_INSTALL")
plugin_class_name = scope.get_string("PLUGIN_CLASS_NAME") plugin_class_name = scope.get_string("PLUGIN_CLASS_NAME")
if plugin_class_name: if plugin_class_name: