Merge pull request andreasbuhr#22 from andreasbuhr/andreasbuhr-patch-1

add C++17 test configurations

Author: andreasbuhr

.github/workflows/cmake.yml

@@ -20,35 +20,76 @@ jobs:
       matrix:
         config:
           - {
-            name: "Linux g++ 10.2",
+            name: "Linux g++ 10.2 C++17",
             os: ubuntu-20.04,
             cxx: "g++-10",
+            cxxver: 17,
           }
           - {
-            name: "Linux clang-10",
+            name: "Linux g++ 10.2 C++20",
+            os: ubuntu-20.04,
+            cxx: "g++-10",
+            cxxver: 20,
+          }
+          - {
+            name: "Linux clang-10 C++17",
             os: ubuntu-20.04,
             cxx: "clang++-10",
             cxx_flags: -stdlib=libc++,
             exe_linker_flags: -lc++,
+            cxxver: 17,
+          }
+          - {
+            name: "Linux clang-10 C++20",
+            os: ubuntu-20.04,
+            cxx: "clang++-10",
+            cxx_flags: -stdlib=libc++,
+            exe_linker_flags: -lc++,
+            cxxver: 20,
+          }
+          - {
+            name: "Linux clang-11 C++17",
+            os: ubuntu-20.04,
+            cxx: "clang++-11",
+            cxx_flags: -stdlib=libc++,
+            exe_linker_flags: -lc++,
+            cxxver: 17,
           }
           - {
-            name: "Linux clang-11",
+            name: "Linux clang-11 C++20",
             os: ubuntu-20.04,
             cxx: "clang++-11",
             cxx_flags: -stdlib=libc++,
             exe_linker_flags: -lc++,
+            cxxver: 20,
           }
           - {
-            name: "Windows MSVC 2017 (x64)",
+            name: "Windows MSVC 2017 (x64) C++17",
             os: windows-2016,
             cxx: "cl",
             environment_script: "C:/Program Files (x86)/Microsoft Visual Studio/2017/Enterprise/VC/Auxiliary/Build/vcvars64.bat",
+            cxxver: 17,
+          }
+          - {
+            name: "Windows MSVC 2017 (x64) C++20",
+            os: windows-2016,
+            cxx: "cl",
+            environment_script: "C:/Program Files (x86)/Microsoft Visual Studio/2017/Enterprise/VC/Auxiliary/Build/vcvars64.bat",
+            cxxver: 20,
+          }
+          - {
+            name: "Windows MSVC 2019 (x64) C++17",
+            os: windows-latest,
+            cxx: "cl",
+            environment_script: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat",
+            cxxver: 17,
           }
           - {
-            name: "Windows MSVC 2019 (x64)",
+            name: "Windows MSVC 2019 (x64) C++20",
             os: windows-latest,
             cxx: "cl",
             environment_script: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat",
+            cxxver: 20,
           }
 
     steps:
@@ -106,7 +147,7 @@ jobs:
 
         cmake $GITHUB_WORKSPACE \
           -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
-          -DCMAKE_CXX_STANDARD=20 \
+          -DCMAKE_CXX_STANDARD=${{ matrix.config.cxxver }} \
           -DBUILD_TESTING=ON \
           -DCMAKE_CXX_FLAGS=${{ matrix.config.cxx_flags }} \
           -DCMAKE_EXE_LINKER_FLAGS=${{ matrix.config.exe_linker_flags }} \

cmake/FindCoroutines.cmake

@@ -152,7 +152,7 @@ if(find_final)
     check_include_file_cxx("coroutine" _CXX_COROUTINES_HAVE_HEADER)
     if(_CXX_COROUTINES_HAVE_HEADER)
         check_cxx_source_compiles("#include <coroutine> \n typedef std::suspend_never blub; \nint main() {} " _CXX_COROUTINES_FINAL_HEADER_COMPILES)
-        set(_CXX_COROUTINES_HAVE_HEADER ${}_CXX_COROUTINES_FINAL_HEADER_COMPILES})
+        set(_CXX_COROUTINES_HAVE_HEADER "${_CXX_COROUTINES_FINAL_HEADER_COMPILES}")
     endif()
 
     if(NOT _CXX_COROUTINES_HAVE_HEADER)
@@ -161,9 +161,9 @@ if(find_final)
         check_include_file_cxx("coroutine" _CXX_COROUTINES_HAVE_HEADER_WITH_FLAG)
         if(_CXX_COROUTINES_HAVE_HEADER_WITH_FLAG)
             check_cxx_source_compiles("#include <coroutine> \n typedef std::suspend_never blub; \nint main() {} " _CXX_COROUTINES_FINAL_HEADER_COMPILES_WITH_FLAG)
-            set(_CXX_COROUTINES_HAVE_HEADER_WITH_FLAG ${_CXX_COROUTINES_FINAL_HEADER_COMPILES_WITH_FLAG})
+            set(_CXX_COROUTINES_HAVE_HEADER_WITH_FLAG "${_CXX_COROUTINES_FINAL_HEADER_COMPILES_WITH_FLAG}")
         endif()
-        set(_CXX_COROUTINES_HAVE_HEADER ${_CXX_COROUTINES_HAVE_HEADER_WITH_FLAG})
+        set(_CXX_COROUTINES_HAVE_HEADER "${_CXX_COROUTINES_HAVE_HEADER_WITH_FLAG}")
         cmake_pop_check_state()
     endif()
     mark_as_advanced(_CXX_COROUTINES_HAVE_HEADER)
@@ -182,7 +182,7 @@ if(find_experimental)
         cmake_push_check_state()
         set(CMAKE_REQUIRED_FLAGS "${_CXX_COROUTINES_EXTRA_FLAGS}")
         check_include_file_cxx("experimental/coroutine" _CXX_COROUTINES_HAVE_EXPERIMENTAL_HEADER_WITH_FLAG)
-        set(_CXX_COROUTINES_HAVE_EXPERIMENTAL_HEADER ${_CXX_COROUTINES_HAVE_EXPERIMENTAL_HEADER_WITH_FLAG})
+        set(_CXX_COROUTINES_HAVE_EXPERIMENTAL_HEADER "${_CXX_COROUTINES_HAVE_EXPERIMENTAL_HEADER_WITH_FLAG}")
         cmake_pop_check_state()
     endif()
     mark_as_advanced(_CXX_COROUTINES_HAVE_EXPERIMENTAL_HEADER)
@@ -256,7 +256,7 @@ if(CXX_COROUTINES_HAVE_COROUTINES)
         # Add the -fcoroutines-ts (or /await) flag
         set(CMAKE_REQUIRED_FLAGS "${_CXX_COROUTINES_EXTRA_FLAGS}")
         check_cxx_source_compiles("${code}" CXX_COROUTINES_AWAIT_NEEDED)
-        set(can_link ${CXX_COROUTINES_AWAIT_NEEDED})
+        set(can_link "${CXX_COROUTINES_AWAIT_NEEDED}")
     endif()
 
     if(can_link)