[LyX/master] Improved package build script for MacOS. Handle compiler standard for Qt6.

[Stephan Witt]

commit 9d6e704183009221ae3996608728537cfb772238
Author: Stephan Witt <sw...@lyx.org>
Date:   Sat Apr 9 09:19:46 2022 +0200

    Improved package build script for MacOS. Handle compiler standard for Qt6.
---
 development/LyX-Mac-binary-release.sh |   31 +++++++++++++++++++++----------
 1 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/development/LyX-Mac-binary-release.sh 
b/development/LyX-Mac-binary-release.sh
index 017a610..cc7320d 100644
--- a/development/LyX-Mac-binary-release.sh
+++ b/development/LyX-Mac-binary-release.sh
@@ -284,9 +284,9 @@ while [ $# -gt 0 ]; do
                LyxOnlyPackage=$(echo ${1}|cut -d= -f2)
                shift
                ;;
-       --enable-cxx11)
+       --enable-cxx11|--enable-cxx-mode=*)
                LyXConfigureOptions="${LyXConfigureOptions} ${1}"
-               EnableCXX11="--enable-cxx11"
+               EnableCXXMode="${1}"
                shift
                ;;
        --*)
@@ -374,6 +374,12 @@ case "${QtVersion}" in
 6*)
        QtLibraries=${QtLibraries:-"QtCore5Compat QtDBus QtSvg QtXml 
QtPrintSupport QtSvgWidgets QtWidgets QtGui QtNetwork QtConcurrent QtCore"}
        QtFrameworkVersion="A"
+       case "${EnableCXXMode}" in
+       --enable-cxx11|--enable-cxx-mode=11)
+               echo Warning: Adjust cxx standard "${EnableCXXMode}" for Qt 6. 
C++17 or better is required.
+               EnableCXXMode="--enable-cxx-mode=17"
+               ;;
+       esac
        ;;
 *)
        QtLibraries=${QtLibraries:-"QtSvg QtXml QtGui QtNetwork QtCore"}
@@ -412,6 +418,19 @@ esac
 MYCFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}"
 MYLDFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}"
 
+case "${EnableCXXMode}" in
+--enable-cxx11|--enable-cxx-mode=11)
+       export CC=cc
+       export CXX="c++ -stdlib=libc++"
+       export CXXFLAGS=-std=c++11
+       ;;
+--enable-cxx-mode=17)
+       export CC=cc
+       export CXX="c++ -stdlib=libc++"
+       export CXXFLAGS=-std=c++17
+       ;;
+esac
+
 build_qt() {
        echo Build Qt library ${QtSourceDir}
        if [ "${QtInstallDir}" = "${QtBuildDir}" ]; then
@@ -641,14 +660,6 @@ build_lyx() {
                rm -rf "${LyxAppPrefix}"
        fi
 
-       case "${EnableCXX11}" in
-       "--enable-cxx11")
-               export CC=cc
-               export CXX="c++ -stdlib=libc++"
-               export CXXFLAGS=-std=c++11
-               ;;
-       esac
-
        # -------------------------------------
        # Automate configure check
        # -------------------------------------
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs