Testing of C++14 and C++17 detection improved
Previously if the compiler was detected to support c++11, -std=c++11 was set preventing c++17 code from being properly tested. Now c++14 and c++17 support is looked for and the -std flag is appropriately set to the compiler's maximum supported version.
This commit is contained in:
parent
f198ff0a43
commit
0a99192339
1 changed files with 35 additions and 3 deletions
38
configure.ac
38
configure.ac
|
|
@ -301,15 +301,47 @@ PLATCXXFLAGS="$PLATCFLAGS"
|
||||||
if test x"$enable_cpp11_testing" = xyes; then
|
if test x"$enable_cpp11_testing" = xyes; then
|
||||||
CXX_SAVED=$CXX
|
CXX_SAVED=$CXX
|
||||||
CXXCPP_SAVED=$CXXCPP
|
CXXCPP_SAVED=$CXXCPP
|
||||||
|
|
||||||
|
# Test for c++17
|
||||||
CXXCPP=" "
|
CXXCPP=" "
|
||||||
AX_CXX_COMPILE_STDCXX(11, [noext], [optional])
|
AX_CXX_COMPILE_STDCXX(17, [noext], [optional])
|
||||||
AC_MSG_CHECKING([whether C++11 testing is actually enabled])
|
AC_MSG_CHECKING([whether C++17 and earlier testing is enabled])
|
||||||
if test "$HAVE_CXX11" = "1"; then
|
if test "$HAVE_CXX17" = "1"; then
|
||||||
AC_MSG_RESULT([yes])
|
AC_MSG_RESULT([yes])
|
||||||
PLATCXXFLAGS="$CXXCPP $PLATCXXFLAGS"
|
PLATCXXFLAGS="$CXXCPP $PLATCXXFLAGS"
|
||||||
|
HAVE_CXX14="1"
|
||||||
|
HAVE_CXX11="1"
|
||||||
else
|
else
|
||||||
AC_MSG_RESULT([no])
|
AC_MSG_RESULT([no])
|
||||||
|
|
||||||
|
# Test for c++14
|
||||||
|
CXXCPP=" "
|
||||||
|
CXX=$CXX_SAVED
|
||||||
|
AX_CXX_COMPILE_STDCXX(14, [noext], [optional])
|
||||||
|
AC_MSG_CHECKING([whether C++14 and earlier testing is enabled])
|
||||||
|
if test "$HAVE_CXX14" = "1"; then
|
||||||
|
AC_MSG_RESULT([yes])
|
||||||
|
PLATCXXFLAGS="$CXXCPP $PLATCXXFLAGS"
|
||||||
|
HAVE_CXX11="1"
|
||||||
|
else
|
||||||
|
AC_MSG_RESULT([no])
|
||||||
|
|
||||||
|
# Test for c++11
|
||||||
|
CXXCPP=" "
|
||||||
|
CXX=$CXX_SAVED
|
||||||
|
AX_CXX_COMPILE_STDCXX(11, [noext], [optional])
|
||||||
|
AC_MSG_CHECKING([whether C++11 and earlier testing is enabled])
|
||||||
|
if test "$HAVE_CXX11" = "1"; then
|
||||||
|
AC_MSG_RESULT([yes])
|
||||||
|
PLATCXXFLAGS="$CXXCPP $PLATCXXFLAGS"
|
||||||
|
else
|
||||||
|
AC_MSG_RESULT([no])
|
||||||
|
fi
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
CXX=$CXX_SAVED
|
CXX=$CXX_SAVED
|
||||||
CXXCPP=$CXXCPP_SAVED
|
CXXCPP=$CXXCPP_SAVED
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue