libraries/libmatricxx
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fix C++11 detection

Browse Source
This commit is contained in:
Marc Wäckerlin
2016-08-19 16:07:23 +00:00
parent b9ccd5dee5
commit 8985f1a5e8
6 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
COPYING
View File

@@ -1 +1 @@
/usr/share/automake-1.14/COPYING /usr/share/automake-1.15/COPYING

14
ChangeLog
View File

@@ -1,3 +1,17 @@
2016-08-19 14:52
* COPYING, INSTALL, ax_cxx_compile_stdcxx_11.m4,
ax_init_standard_project.m4, bootstrap.sh, makefile_test.inc.am,
src/matrix.hxx, test/basic.cxx: more operators more tests
2016-08-18 22:03
* COPYING, ChangeLog, INSTALL, src/matrix.hxx: more operators
2016-08-17 07:26
* configure.ac: only requires c++11
2016-08-16 14:41 2016-08-16 14:41
* COPYING, INSTALL, ax_init_standard_project.m4, configure.ac, * COPYING, INSTALL, ax_init_standard_project.m4, configure.ac,

2
INSTALL
View File

@@ -1 +1 @@
/usr/share/automake-1.14/INSTALL /usr/share/automake-1.15/INSTALL

4
ax_cxx_compile_stdcxx_11.m4
View File

@@ -201,15 +201,17 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX_14], [dnl
AC_MSG_ERROR([*** A compiler with support for C++14 language features is required.]) AC_MSG_ERROR([*** A compiler with support for C++14 language features is required.])
fi fi
else else
HAVE_CXX11=${HAVE_CXX14}
if test x$ac_success = xno; then if test x$ac_success = xno; then
HAVE_CXX14=0 HAVE_CXX14=0
AC_MSG_NOTICE([No compiler with C++14 support was found]) AC_MSG_NOTICE([No compiler with C++14 support was found])
AX_CXX_COMPILE_STDCXX_11([$1], [optional]) AX_CXX_COMPILE_STDCXX_11([$1], [optional])
else else
HAVE_CXX11=1
HAVE_CXX14=1 HAVE_CXX14=1
AC_DEFINE(HAVE_CXX14,1, AC_DEFINE(HAVE_CXX14,1,
[define if the compiler supports basic C++14 syntax]) [define if the compiler supports basic C++14 syntax])
AC_DEFINE(HAVE_CXX11,1,
[define if the compiler supports basic C++14 syntax])
fi fi
AC_SUBST(HAVE_CXX11) AC_SUBST(HAVE_CXX11)
AC_SUBST(HAVE_CXX14) AC_SUBST(HAVE_CXX14)

4
ax_init_standard_project.m4
View File

@@ -252,6 +252,10 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
if test "$GCOV" == "yes"; then if test "$GCOV" == "yes"; then
GCOV=gcov GCOV=gcov
fi fi
AC_CHECK_PROG(has_gcov, [$GCOV], [yes], [no])
if test "$has_gcov" != "yes"; then
AC_MSG_ERROR([gcov: program $GCOV not found])
fi
AC_MSG_NOTICE([Coverage tests enabled, using ${GCOV}]); AC_MSG_NOTICE([Coverage tests enabled, using ${GCOV}]);
AM_CXXFLAGS="${AM_CXXFLAGS:-} -O0 --coverage -fprofile-arcs -ftest-coverage" AM_CXXFLAGS="${AM_CXXFLAGS:-} -O0 --coverage -fprofile-arcs -ftest-coverage"
AM_LDFLAGS="${AM_LDFLAGS} -O0 --coverage -fprofile-arcs" AM_LDFLAGS="${AM_LDFLAGS} -O0 --coverage -fprofile-arcs"

4
makefile_test.inc.am
View File

@@ -3,3 +3,7 @@
## 1 2 3 4 5 6 7 8 ## 1 2 3 4 5 6 7 8
## 45678901234567890123456789012345678901234567890123456789012345678901234567890 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890
%.gcda: %
gcov $<
CLEANFILES += ${CLEANFILES} ${TEST:%=%.gcno} ${TEST:%=%.gcda} *.gcov