anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-19 14:30:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Detect clang version in autoconf (and use it a bit)

Browse Source 
The version is read by checking the macros __clang_major__,
__clang_minor__ and __clang_patchlevel__. Hopefully they will have
coherent values everywhere.

For now, the version is used to set warnings a bit more reasonably for
older clang versions, which do not support -Wdeprecated-register and
some others that are used in pragmas in boost.

This removes many warnings when compiling with clang 3.3.
This commit is contained in:
Jean-Marc Lasgouttes 2016-06-13 11:25:23 +02:00
parent b2b8733096
commit e8655e9a70
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
config/lyxinclude.m4
View File

@ -143,6 +143,20 @@ AC_DEFUN([LYX_PROG_CLANG],
#endif
],
[lyx_cv_prog_clang=yes ; CLANG=yes], [lyx_cv_prog_clang=no ; CLANG=no])])
if test $CLANG = yes ; then
AC_CACHE_CHECK([for clang version],
[lyx_cv_clang_version],
[clang_noversion=no
AC_COMPUTE_INT(clang_major,__clang_major__,,[clang_noversion_=yes])
AC_COMPUTE_INT(clang_minor,__clang_minor__,,[clang_noversion_=yes])
AC_COMPUTE_INT(clang_patchlevel,__clang_patchlevel__,,[clang_noversion_=yes])
if test $clang_noversion = yes ; then
clang_version=unknown
else
clang_version=$clang_major.$clang_minor.$clang_patchlevel
fi
lyx_cv_clang_version=$clang_version])
fi
])
@ -317,7 +331,8 @@ if test x$GXX = xyes; then
gxx_version=`${CXX} -dumpversion`
CXX_VERSION="($gxx_version)"
else
gxx_version=clang
gxx_version=clang-$clang_version
CXX_VERSION="($clang_version)"
fi
AM_CXXFLAGS="$lyx_optim"
@ -359,9 +374,13 @@ if test x$GXX = xyes; then
dnl Note that this will define __GXX_EXPERIMENTAL_CXX0X__.
dnl The source code relies on that.
cxx11_flags="-std=c++0x";;
clang)
clang-3.0*|clang-3.1*|clang-3.2*|clang-3.3*)
dnl presumably all clang versions support c++11.
dnl the deprecated-register warning is very annoying with Qt4.x right now.
dnl boost contains pragmas that are annoying on older clang versions
cxx11_flags="-std=c++11 -Wno-unknown-pragmas";;
clang*)
dnl the more recent versions support the deprecated-register warning,
dnl which is very annoying with Qt4.x right now.
cxx11_flags="-std=c++11"
AM_CXXFLAGS="$AM_CXXFLAGS -Wno-deprecated-register";;
*)