diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-11-11 18:13:56 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-11-12 15:25:06 +0100 |
commit | 267bb4ec6c628d998ba7f11bcdf56cc03b0aa5a0 (patch) | |
tree | 02f99b6dfa727e1aa71514003f359e04b4911249 /util/cmake/pro2cmake.py | |
parent | 34437b9e14f531fd514941143f34e95639d9cb74 (diff) |
CMake: pro2cmake: Reformat scripts using black8 again
Change-Id: I1b024867e76baa2e443e95a5e980745b65ee1f19
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'util/cmake/pro2cmake.py')
-rwxr-xr-x | util/cmake/pro2cmake.py | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index 4f7118007e..6308ab0a6d 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -396,10 +396,13 @@ def detect_cmake_api_version_used_in_file_content(project_file_path: str) -> Opt api_call_versions = sorted(api_call_versions, reverse=True) api_call_version_matches = {} for version in api_call_versions: - versioned_api_calls = [cmake_api_calls[version][api_call] - for api_call in cmake_api_calls[version]] + versioned_api_calls = [ + cmake_api_calls[version][api_call] for api_call in cmake_api_calls[version] + ] versioned_api_calls_alternatives = "|".join(versioned_api_calls) - api_call_version_matches[version] = re.search(versioned_api_calls_alternatives, contents) + api_call_version_matches[version] = re.search( + versioned_api_calls_alternatives, contents + ) # If new style found, return latest api version. Otherwise # return the current version. @@ -2928,12 +2931,10 @@ def write_windows_part(cm_fh: IO[str], target: str, scope: Scope, indent: int = def write_aux_qml_file_install_call(cm_fh: IO[str], file_list: List[str], indent: int = 0): cm_fh.write(f"\n{spaces(indent)}qt_copy_or_install(\n") - write_list( - cm_fh, file_list, "FILES", indent + 1 - ) + write_list(cm_fh, file_list, "FILES", indent + 1) destination_option = 'DESTINATION "${__aux_qml_files_install_dir}"' - cm_fh.write(f'{spaces(indent + 1)}{destination_option})\n') + cm_fh.write(f"{spaces(indent + 1)}{destination_option})\n") def write_aux_qml_path_setup(cm_fh: IO[str], base_dir: str, indent: int = 0): @@ -3419,7 +3420,7 @@ def write_module(cm_fh: IO[str], scope: Scope, *, indent: int = 0) -> str: module_name_for_pri_as_cmake_computes_it = cmake_target_name.lower() if module_name_for_pri != module_name_for_pri_as_cmake_computes_it: - extra.append(f'CONFIG_MODULE_NAME {module_name_for_pri}') + extra.append(f"CONFIG_MODULE_NAME {module_name_for_pri}") if is_static: extra.append("STATIC") @@ -3665,8 +3666,9 @@ def write_jar(cm_fh: IO[str], scope: Scope, *, indent: int = 0) -> str: return target -def write_win32_and_mac_bundle_properties(cm_fh: IO[str], scope: Scope, target: str, *, - handling_first_scope=False, indent: int = 0): +def write_win32_and_mac_bundle_properties( + cm_fh: IO[str], scope: Scope, target: str, *, handling_first_scope=False, indent: int = 0 +): config = scope.get("CONFIG") win32 = all(val not in config for val in ["cmdline", "console"]) mac_bundle = all(val not in config for val in ["cmdline", "-app_bundle"]) @@ -3674,8 +3676,10 @@ def write_win32_and_mac_bundle_properties(cm_fh: IO[str], scope: Scope, target: true_value = "TRUE" false_value = "FALSE" - properties_mapping = {"WIN32_EXECUTABLE": true_value if win32 else false_value, - "MACOSX_BUNDLE": true_value if mac_bundle else false_value} + properties_mapping = { + "WIN32_EXECUTABLE": true_value if win32 else false_value, + "MACOSX_BUNDLE": true_value if mac_bundle else false_value, + } properties = [] @@ -3830,7 +3834,7 @@ def write_example( add_target += f"target_sources({binary_name} PRIVATE" else: - add_target = f'qt_add_executable({binary_name}' + add_target = f"qt_add_executable({binary_name}" write_all_source_file_lists(cm_fh, scope, add_target, indent=0) cm_fh.write(")\n") @@ -3858,11 +3862,9 @@ def write_example( io_string, scope, target_sources, indent=indent, footer=")\n" ) - write_win32_and_mac_bundle_properties(io_string, - scope, - binary_name, - handling_first_scope=handling_first_scope, - indent=indent) + write_win32_and_mac_bundle_properties( + io_string, scope, binary_name, handling_first_scope=handling_first_scope, indent=indent + ) write_include_paths( io_string, @@ -4260,7 +4262,6 @@ def handle_app_or_lib( if past_major_versions: cm_fh.write(f"{spaces(indent+1)}QT_QML_PAST_MAJOR_VERSIONS {past_major_versions}\n") - import_name = scope.expandString("QML_IMPORT_NAME") if import_name: cm_fh.write(f"{spaces(indent+1)}QT_QML_MODULE_URI {import_name}\n") |