From cf8c496a59686e618a0e892f39ccbe3396c35c11 Mon Sep 17 00:00:00 2001 From: mjbudd77 Date: Fri, 11 Mar 2022 21:37:41 -0500 Subject: [PATCH] Updated unix debug build script to allow for selectable Qt5 or Qt6 build. --- scripts/unix_debug_build.sh | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/scripts/unix_debug_build.sh b/scripts/unix_debug_build.sh index 7360e4f5..2952ddf3 100755 --- a/scripts/unix_debug_build.sh +++ b/scripts/unix_debug_build.sh @@ -2,6 +2,7 @@ CLEAN_BUILD=0; MAKE_ARGS=""; +QT_MAJOR_VERSION=5; while test $# -gt 0 do @@ -16,6 +17,9 @@ do -j) shift; MAKE_ARGS+=" -j$1 "; ;; + + -qt) shift; QT_MAJOR_VERSION="$1"; + ;; esac shift; done @@ -45,9 +49,24 @@ CMAKE_ARGS="\ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON "; if [[ "$OSTYPE" == "darwin"* ]]; then - export Qt5_DIR=`brew --prefix qt5` - echo "Qt5_DIR=$Qt5_DIR"; - CMAKE_ARGS+=" -DCMAKE_PREFIX_PATH=`brew --prefix qt5` "; + + if [ "$QT_MAJOR_VERSION" == "6" ]; then + export Qt6_DIR=`brew --prefix qt6` + echo "Qt6_DIR=$Qt6_DIR"; + CMAKE_ARGS+=" -DCMAKE_PREFIX_PATH=`brew --prefix qt6` "; + else + export Qt5_DIR=`brew --prefix qt5` + echo "Qt5_DIR=$Qt5_DIR"; + CMAKE_ARGS+=" -DCMAKE_PREFIX_PATH=`brew --prefix qt5` "; + fi +fi + +if [ ! -z "$Qt_DIR" ]; then + CMAKE_ARGS+=" -DCMAKE_PREFIX_PATH=$Qt_DIR "; +fi + +if [ "$QT_MAJOR_VERSION" == "6" ]; then + CMAKE_ARGS+=" -DQT6=1 "; fi #echo $CMAKE_ARGS;