diff options
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CompileFeatures/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Tests/CompileFeatures/default_dialect.cpp | 6 | ||||
| -rw-r--r-- | Tests/FindGTK2/gdk/main.c | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/CTestCommandLine/invalid-ctest-argument-stderr.txt | 3 | ||||
| -rw-r--r-- | Tests/RunCMake/CompileFeatures/compiler_introspection.cmake | 4 |
5 files changed, 11 insertions, 5 deletions
diff --git a/Tests/CompileFeatures/CMakeLists.txt b/Tests/CompileFeatures/CMakeLists.txt index e206e70..d6acd7b 100644 --- a/Tests/CompileFeatures/CMakeLists.txt +++ b/Tests/CompileFeatures/CMakeLists.txt @@ -286,6 +286,7 @@ if (CMAKE_CXX_COMPILE_FEATURES) if (std_flag_idx EQUAL -1) add_executable(default_dialect default_dialect.cpp) target_compile_definitions(default_dialect PRIVATE + DEFAULT_CXX26=$<EQUAL:${CMAKE_CXX_STANDARD_DEFAULT},26> DEFAULT_CXX23=$<EQUAL:${CMAKE_CXX_STANDARD_DEFAULT},23> DEFAULT_CXX20=$<EQUAL:${CMAKE_CXX_STANDARD_DEFAULT},20> DEFAULT_CXX17=$<EQUAL:${CMAKE_CXX_STANDARD_DEFAULT},17> diff --git a/Tests/CompileFeatures/default_dialect.cpp b/Tests/CompileFeatures/default_dialect.cpp index c0cc1b6..b873b14 100644 --- a/Tests/CompileFeatures/default_dialect.cpp +++ b/Tests/CompileFeatures/default_dialect.cpp @@ -3,7 +3,11 @@ template <long l> struct Outputter; -#if DEFAULT_CXX23 +#if DEFAULT_CXX26 +# if CXX_STD <= CXX_STD_23 +Outputter<CXX_STD> o; +# endif +#elif DEFAULT_CXX23 # if CXX_STD <= CXX_STD_20 Outputter<CXX_STD> o; # endif diff --git a/Tests/FindGTK2/gdk/main.c b/Tests/FindGTK2/gdk/main.c index 71f523b..2d03fbe 100644 --- a/Tests/FindGTK2/gdk/main.c +++ b/Tests/FindGTK2/gdk/main.c @@ -2,6 +2,6 @@ int main(int argc, char* argv[]) { - gdk_init(argc, argv); + gdk_init(&argc, &argv); return 0; } diff --git a/Tests/RunCMake/CTestCommandLine/invalid-ctest-argument-stderr.txt b/Tests/RunCMake/CTestCommandLine/invalid-ctest-argument-stderr.txt index 4de2e77..3304a26 100644 --- a/Tests/RunCMake/CTestCommandLine/invalid-ctest-argument-stderr.txt +++ b/Tests/RunCMake/CTestCommandLine/invalid-ctest-argument-stderr.txt @@ -1 +1,2 @@ -CMake Error: Invalid argument: --not-a-valid-ctest-argument +CMake Error: Unknown argument: --not-a-valid-ctest-argument +CMake Error: Run 'ctest --help' for all supported options. diff --git a/Tests/RunCMake/CompileFeatures/compiler_introspection.cmake b/Tests/RunCMake/CompileFeatures/compiler_introspection.cmake index f3360c7..1cfa27e 100644 --- a/Tests/RunCMake/CompileFeatures/compiler_introspection.cmake +++ b/Tests/RunCMake/CompileFeatures/compiler_introspection.cmake @@ -40,6 +40,6 @@ set(${lang}${standard}_EXT_FLAG ${CMAKE_${lang}${standard}_EXTENSION_COMPILE_OPT endforeach() endmacro() -info(C 90 99 11 17 23) -info(CXX 98 11 14 17 20 23) +info(C 90 99 11 17 23 26) +info(CXX 98 11 14 17 20 23 26) file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/info.cmake" "${info}") |