summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--tests/Makefile.am24
2 files changed, 26 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 05a8320f5..c7b73f050 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,11 +106,13 @@ dnl --------------------------------------------------------------------
GP_PEDANTIC_COMPILER_FLAGS([C90], [C], [-std=c90])
GP_PEDANTIC_COMPILER_FLAGS([C99], [C], [-std=c99])
GP_PEDANTIC_COMPILER_FLAGS([C11], [C], [-std=c11])
+GP_PEDANTIC_COMPILER_FLAGS([C2X], [C], [-std=c2x])
dnl
GP_PEDANTIC_COMPILER_FLAGS([CXX98], [C++], [-std=c++98])
GP_PEDANTIC_COMPILER_FLAGS([CXX11], [C++], [-std=c++11])
GP_PEDANTIC_COMPILER_FLAGS([CXX14], [C++], [-std=c++14])
GP_PEDANTIC_COMPILER_FLAGS([CXX17], [C++], [-std=c++17])
+GP_PEDANTIC_COMPILER_FLAGS([CXX20], [C++], [-std=c++20])
GP_CONDITIONAL_COMPILE_FLAGS([CFLAGS],[-Wall])
GP_CONDITIONAL_COMPILE_FLAGS([CFLAGS],[-Wextra])
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f3a615b94..5933f72ee 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -132,6 +132,17 @@ test_pedantic_c11_CFLAGS = $(GP_PEDANTIC_CFLAGS_C11)
test_pedantic_c11_LDADD =
test_pedantic_c11_LDFLAGS =
+if GP_HAVE_PEDANTIC_FLAGS_C2X
+TESTS += test-pedantic-c2x
+check_PROGRAMS += test-pedantic-c2x
+endif
+EXTRA_PROGRAMS += test-pedantic-c2x
+test_pedantic_c2x_SOURCES = test-pedantic-compilation.c
+test_pedantic_c2x_CPPFLAGS = $(generic_pedantic_cppflags)
+test_pedantic_c2x_CFLAGS = $(GP_PEDANTIC_CFLAGS_C2X)
+test_pedantic_c2x_LDADD =
+test_pedantic_c2x_LDFLAGS =
+
if HAVE_CXX
if GP_HAVE_PEDANTIC_FLAGS_CXX98
TESTS += test-pedantic-cxx98
@@ -184,6 +195,19 @@ test_pedantic_cxx17_CXXFLAGS = $(GP_PEDANTIC_CXXFLAGS_CXX17)
test_pedantic_cxx17_LDADD =
test_pedantic_cxx17_LDFLAGS =
+if HAVE_CXX
+if GP_HAVE_PEDANTIC_FLAGS_CXX20
+TESTS += test-pedantic-cxx20
+check_PROGRAMS += test-pedantic-cxx20
+endif
+endif
+EXTRA_PROGRAMS += test-pedantic-cxx20
+test_pedantic_cxx20_SOURCES = test-pedantic-compilation.cxx
+test_pedantic_cxx20_CPPFLAGS = $(generic_pedantic_cppflags)
+test_pedantic_cxx20_CXXFLAGS = $(GP_PEDANTIC_CXXFLAGS_CXX20)
+test_pedantic_cxx20_LDADD =
+test_pedantic_cxx20_LDFLAGS =
+
########################################################################
# Implement the checks for the installed library