Skip to content
Snippets Groups Projects
Commit 71aa96d0 authored by Kateryna Kostiuk's avatar Kateryna Kostiuk Committed by Sébastien Blin
Browse files

qt-client: build for macOS

Change-Id: I7e44b91981702be83f4dd848c513d16d3dcc9f88
parent 210cac64
No related branches found
No related tags found
No related merge requests found
......@@ -394,7 +394,12 @@ def run_install(args):
environ['CMAKE_PREFIX_PATH'] = proc.stdout.rstrip("\n")
environ['CONFIGURE_FLAGS'] = '--without-dbus'
if args.qt is None:
install_args += ("-c", "client-macosx")
else:
install_args += ("-c", "client-qt")
install_args += ("-q", args.qtver)
install_args += ("-Q", args.qt)
else:
if args.distribution in ZYPPER_BASED_DISTROS:
# fix jsoncpp pkg-config bug, remove when jsoncpp package bumped
......@@ -592,6 +597,7 @@ def validate_args(parsed_args):
if parsed_args.qt is not None:
supported_qt_distros = [
'guix',
OSX_DISTRIBUTION_NAME,
WIN32_DISTRIBUTION_NAME
] + APT_BASED_DISTROS + DNF_BASED_DISTROS + PACMAN_BASED_DISTROS
......
......@@ -130,6 +130,8 @@ if [ "${client}" = "client-qt" ] && [ -z "$qt6path" ]; then
sys_qt6ver=$(qmake -v)
elif command -v qmake-qt6 &> /dev/null; then
sys_qt6ver=$(qmake-qt6 -v) # Fedora
elif command -v qmake6 &> /dev/null; then
sys_qt6ver=$(qmake6 -v) # macOS
else
echo "No valid Qt found"; exit 1;
fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment