Update fr.po

[features.git] / development / LyX-Mac-binary-release.sh

diff --git a/development/LyX-Mac-binary-release.sh b/development/LyX-Mac-binary-release.sh
index 017a61072cc6aef34db03366e778f4794ba423ee..8bad69d6121d83e4e289ee2c29ae45f19ce67e7b 100644 (file)
--- a/development/LyX-Mac-binary-release.sh
+++ b/development/LyX-Mac-binary-release.sh
@@ -284,9 +284,8 @@ while [ $# -gt 0 ]; do
                LyxOnlyPackage=$(echo ${1}|cut -d= -f2)
                shift
                ;;
-       --enable-cxx11)
-               LyXConfigureOptions="${LyXConfigureOptions} ${1}"
-               EnableCXX11="--enable-cxx11"
+       --enable-cxx11|--enable-cxx-mode=*)
+               EnableCXXMode="${1}"
                shift
                ;;
        --*)
@@ -374,6 +373,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 +417,21 @@ 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
+       LyXConfigureOptions="${LyXConfigureOptions} --enable-cxx-mode=11"
+       ;;
+--enable-cxx-mode=17)
+       export CC=cc
+       export CXX="c++ -stdlib=libc++"
+       export CXXFLAGS=-std=c++17
+       LyXConfigureOptions="${LyXConfigureOptions} ${EnableCXXMode}"
+       ;;
+esac
+
 build_qt() {
        echo Build Qt library ${QtSourceDir}
        if [ "${QtInstallDir}" = "${QtBuildDir}" ]; then
@@ -641,14 +661,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
        # -------------------------------------