Skip to content
Snippets Groups Projects
Commit a6b60971 authored by Alexandre Lision's avatar Alexandre Lision Committed by Alexandre Lision
Browse files

osx: export qt5 dir

Automatize export of CMAKE_PREFIX_PATH
environnement variables created from make-ring are not passed to cmake
(cmake must fork the top level parent process, which does not have the
env var created by python)
We need to pass it in the cmake command line

Tuleap: #449
Change-Id: I28d57196d2963152d1708c286e96293a4cb005fb
parent e3d89bc5
Branches
Tags
No related merge requests found
...@@ -134,6 +134,9 @@ def run_install(args): ...@@ -134,6 +134,9 @@ def run_install(args):
if args.global_install: if args.global_install:
install_args += ' -g' install_args += ' -g'
if args.distribution == "OSX": if args.distribution == "OSX":
proc= subprocess.Popen("brew --prefix qt5", shell=True, stdout=subprocess.PIPE)
qt5dir = proc.stdout.read()
os.environ['CMAKE_PREFIX_PATH'] = str(qt5dir.decode('ascii'))
install_args += " -c client-macosx" install_args += " -c client-macosx"
execute_script(["CONFIGURE_FLAGS='--without-dbus' ./scripts/install.sh " + install_args]) execute_script(["CONFIGURE_FLAGS='--without-dbus' ./scripts/install.sh " + install_args])
else: else:
......
...@@ -71,9 +71,9 @@ cd "${TOP}/lrc" ...@@ -71,9 +71,9 @@ cd "${TOP}/lrc"
mkdir -p ${BUILDDIR} mkdir -p ${BUILDDIR}
cd ${BUILDDIR} cd ${BUILDDIR}
if $global; then if $global; then
cmake .. -DCMAKE_BUILD_TYPE=Debug $static cmake .. -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH -DCMAKE_BUILD_TYPE=Debug $static
else else
cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="${INSTALL}/lrc" -DRING_BUILD_DIR="${DAEMON}/src" $static cmake .. -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="${INSTALL}/lrc" -DRING_BUILD_DIR="${DAEMON}/src" $static
fi fi
make make
make_install $global make_install $global
...@@ -82,9 +82,9 @@ cd "${TOP}/${client}" ...@@ -82,9 +82,9 @@ cd "${TOP}/${client}"
mkdir -p ${BUILDDIR} mkdir -p ${BUILDDIR}
cd ${BUILDDIR} cd ${BUILDDIR}
if $global; then if $global; then
cmake .. $static cmake .. -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH $static
else else
cmake .. -DCMAKE_INSTALL_PREFIX="${INSTALL}/${client}" -DLibRingClient_DIR="${INSTALL}/lrc/lib/cmake/LibRingClient" $static cmake .. -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH -DCMAKE_INSTALL_PREFIX="${INSTALL}/${client}" -DLibRingClient_DIR="${INSTALL}/lrc/lib/cmake/LibRingClient" $static
fi fi
make make
make_install $global make_install $global
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment