From 143a9d0bb35e2ccf2ed7a7b7a077a353dcf79234 Mon Sep 17 00:00:00 2001 From: Scarlett Moore Date: Fri, 25 Aug 2023 07:01:31 -0700 Subject: [PATCH] qmake plugin: append source to configure command before conditional and shorten conditional. --- craft_parts/plugins/qmake_plugin.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/craft_parts/plugins/qmake_plugin.py b/craft_parts/plugins/qmake_plugin.py index 4b36a23c9..eaf2b3adb 100644 --- a/craft_parts/plugins/qmake_plugin.py +++ b/craft_parts/plugins/qmake_plugin.py @@ -122,16 +122,15 @@ def get_build_commands(self) -> List[str]: 'QMAKE_LFLAGS+="${LDFLAGS:-}"', ] + options.qmake_parameters + qmake_configure_command.append(f'"{self._part_info.part_src_dir}"') + if options.qmake_project_file: qmake_configure_command.extend( [ - f'"{self._part_info.part_src_dir}"', "/", f'"{options.qmake_project_file}"', ] ) - else: - qmake_configure_command.append(f'"{self._part_info.part_src_dir}"') return [ " ".join(qmake_configure_command),