From 4f7d9eef51da4a72fd7c7a17bcbbcf83ffad3216 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 8 Aug 2017 10:46:00 -0400 Subject: Features: Fix COMPILE_FEATURES genex for C++ 14 and 17 features When `CXX_STANDARD` is not at least 14 or 17, features enabled by the compiler for those standards should not be reported as existing by the `COMPILE_FEATURES` genex. Fix the implementation and add a test. --- Tests/CompileFeatures/genex_test.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'Tests/CompileFeatures/genex_test.cpp') diff --git a/Tests/CompileFeatures/genex_test.cpp b/Tests/CompileFeatures/genex_test.cpp index 5ae8a78802..5303e738ee 100644 --- a/Tests/CompileFeatures/genex_test.cpp +++ b/Tests/CompileFeatures/genex_test.cpp @@ -11,6 +11,18 @@ #error EXPECT_OVERRIDE_CONTROL not defined #endif +#ifdef TEST_CXX_STD +#if !HAVE_CXX_STD_11 +#error HAVE_CXX_STD_11 is false with CXX_STANDARD == 11 +#endif +#if HAVE_CXX_STD_14 +#error HAVE_CXX_STD_14 is true with CXX_STANDARD == 11 +#endif +#if HAVE_CXX_STD_17 +#error HAVE_CXX_STD_17 is true with CXX_STANDARD == 11 +#endif +#endif + #if !HAVE_OVERRIDE_CONTROL #if EXPECT_OVERRIDE_CONTROL #error "Expect override control feature" -- cgit v1.2.1