anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

prepare using Qt 5.7, change compiler and flags when using --enable-cxx11

Browse Source
This commit is contained in:
Stephan Witt 2017-01-14 16:05:50 +01:00
parent ed7d3a33ab
commit ffa681b78c
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
development/LyX-Mac-binary-release.sh
View File

@ -65,7 +65,7 @@ case "${QtVersion}:${QtAPI}" in
QtConfigureOptions="${QtConfigureOptions} -nomake examples -nomake demos -nomake docs -nomake tools"
QtMajorVersion=qt5
;;
5.6*)
5.6*|5.7*)
QtConfigureOptions="${QtConfigureOptions} -no-strip"
QtConfigureOptions="${QtConfigureOptions} -no-kms -no-pkg-config"
QtConfigureOptions="${QtConfigureOptions} -nomake examples -nomake tools"
@ -276,6 +276,11 @@ while [ $# -gt 0 ]; do
LyxOnlyPackage=$(echo ${1}|cut -d= -f2)
shift
;;
--enable-cxx11)
LyXConfigureOptions="${LyXConfigureOptions} ${1}"
EnableCXX11="--enable-cxx11"
shift
;;
--*)
LyXConfigureOptions="${LyXConfigureOptions} ${1}"
shift
@ -629,6 +634,14 @@ build_lyx() {
if [ -n "${LyxAppZip}" -a -f "${LyxAppZip}" ]; then rm "${LyxAppZip}"; fi
if [ -d "${LyxAppPrefix}" ]; then 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
# -------------------------------------