Skip to content
Snippets Groups Projects
Commit 5d1bea91 authored by Amin Bandali's avatar Amin Bandali
Browse files

build: Adapt (on GNU/Linux) to client-qt vendoring libjamiclient.

This patch targets GNU/Linux; macOS and Windows to be handled later.

Change-Id: I20581f8c1c345b087b117ce4441cb145b6e6e01d
parent d895866e
Branches
Tags
No related merge requests found
......@@ -532,12 +532,14 @@ def run_clean():
def run_run(args):
if args.distribution == OSX_DISTRIBUTION_NAME:
if args.distribution == OSX_DISTRIBUTION_NAME and args.qt is None:
subprocess.Popen(
["install/client-macosx/Ring.app/Contents/MacOS/Ring"])
return True
run_env = os.environ
if args.gnome or (args.distribution == OSX_DISTRIBUTION_NAME \
and args.qt is None):
run_env['LD_LIBRARY_PATH'] = run_env.get(
'LD_LIBRARY_PATH', '') + ":install/lrc/lib"
......@@ -718,7 +720,6 @@ def parse_args():
ap.add_argument('--no-priv-install', dest='priv_install',
default=True, action='store_false')
ap.add_argument('--gnome', default=False, action='store_true')
ap.add_argument('--macos', default=False, action='store_true')
ap.add_argument('--qt', nargs='?', const='', type=str,
help='Build the Qt client with the Qt path supplied')
ap.add_argument('--no-libwrap', dest='no_libwrap',
......
......@@ -151,7 +151,8 @@ if [ "${client}" = "client-qt" ] && [ -z "$qtpath" ]; then
fi
fi
# libringclient
# libringclient (only if not client-qt)
if [ "${client}" != "client-qt" ]; then
cd "${TOP}/lrc"
mkdir -p "${BUILDDIR}"
cd "${BUILDDIR}"
......@@ -170,6 +171,7 @@ echo "info: Configuring LRC with flags: ${lrc_cmake_flags[*]}"
cmake .. "${lrc_cmake_flags[@]}"
make -j"${proc}" V=1
make_install "${global}" "${priv_install}"
fi
# client
cd "${TOP}/${client}"
......@@ -180,13 +182,14 @@ client_cmake_flags=(-DCMAKE_BUILD_TYPE="${BUILD_TYPE}"
-DCMAKE_PREFIX_PATH="${qtpath}")
if [ "${client}" = "client-qt" ]; then
client_cmake_flags+=(-DWITH_WEBENGINE="${enable_webengine}")
client_cmake_flags+=(-DENABLE_LIBWRAP="${enable_libwrap}"
-DWITH_WEBENGINE="${enable_webengine}")
if [ "${global}" = "true" ]; then
client_cmake_flags+=(${prefix:+"-DCMAKE_INSTALL_PREFIX=$prefix"}
$static)
else
client_cmake_flags+=(-DCMAKE_INSTALL_PREFIX="${INSTALL}/${client}"
-DLRC="${INSTALL}/lrc")
-DLIBJAMI_BUILD_DIR="${DAEMON}/src")
fi
else
# Compute GNOME client CMake flags.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment