cleanup FindCppcoroCoroutines.cmake

Author: andreasbuhr

README.md

@@ -2954,8 +2954,8 @@ $ cmake . -Dcppcoro_ROOT=$HOME/.local
 # ...
 -- Performing Test Coroutines_SUPPORTS_MS_FLAG
 -- Performing Test Coroutines_SUPPORTS_MS_FLAG - Failed
--- Performing Test Coroutines_SUPPORTS_GNU_FLAG
--- Performing Test Coroutines_SUPPORTS_GNU_FLAG - Success
+-- Performing Test Coroutines_SUPPORTS_COROUTINES_FLAG
+-- Performing Test Coroutines_SUPPORTS_COROUTINES_FLAG - Success
 -- Looking for C++ include coroutine
 -- Looking for C++ include coroutine - not found
 -- Looking for C++ include experimental/coroutine

cmake/FindCppcoroCoroutines.cmake

@@ -3,23 +3,23 @@ include(CheckIncludeFileCXX)
 include(FindPackageHandleStandardArgs)
 
 check_cxx_compiler_flag(/await Coroutines_SUPPORTS_MS_FLAG)
-check_cxx_compiler_flag(-fcoroutines-ts Coroutines_ts_SUPPORTS_GNU_FLAG)
-check_cxx_compiler_flag(-fcoroutines Coroutines_SUPPORTS_GNU_FLAG)
-if(Coroutines_SUPPORTS_MS_FLAG OR Coroutines_ts_SUPPORTS_GNU_FLAG OR Coroutines_SUPPORTS_GNU_FLAG)
+check_cxx_compiler_flag(-fcoroutines-ts Coroutines_SUPPORTS_COROUTINES_TS_FLAG)
+check_cxx_compiler_flag(-fcoroutines Coroutines_SUPPORTS_COROUTINES_FLAG)
+if(Coroutines_SUPPORTS_MS_FLAG OR Coroutines_SUPPORTS_COROUTINES_TS_FLAG OR Coroutines_SUPPORTS_COROUTINES_FLAG)
     set(Coroutines_COMPILER_SUPPORT ON)
 endif()
 
 if(Coroutines_SUPPORTS_MS_FLAG)
-    check_include_file_cxx("coroutine" Coroutines_STANDARD_LIBRARY_SUPPORT "/await")
-    check_include_file_cxx("experimental/coroutine" Coroutines_EXPERIMENTAL_LIBRARY_SUPPORT "/await")
-elseif(Coroutines_ts_SUPPORTS_GNU_FLAG)
-    check_include_file_cxx("coroutine" Coroutines_STANDARD_LIBRARY_SUPPORT "-fcoroutines-ts")
-    check_include_file_cxx("experimental/coroutine" Coroutines_EXPERIMENTAL_LIBRARY_SUPPORT "-fcoroutines-ts")
-elseif(Coroutines_SUPPORTS_GNU_FLAG)
-    check_include_file_cxx("coroutine" Coroutines_STANDARD_LIBRARY_SUPPORT "-fcoroutines")
-    check_include_file_cxx("experimental/coroutine" Coroutines_EXPERIMENTAL_LIBRARY_SUPPORT "-fcoroutines")
+    set(Coroutines_EXTRA_FLAGS "/await")
+elseif(Coroutines_SUPPORTS_COROUTINES_TS_FLAG)
+    set(Coroutines_EXTRA_FLAGS "-fcoroutines-ts")
+elseif(Coroutines_SUPPORTS_COROUTINES_FLAG)
+    set(Coroutines_EXTRA_FLAGS "-fcoroutines")
 endif()
 
+check_include_file_cxx("coroutine" Coroutines_STANDARD_LIBRARY_SUPPORT ${Coroutines_EXTRA_FLAGS})
+check_include_file_cxx("experimental/coroutine" Coroutines_EXPERIMENTAL_LIBRARY_SUPPORT ${Coroutines_EXTRA_FLAGS})
+
 if(Coroutines_EXPERIMENTAL_LIBRARY_SUPPORT OR Coroutines_STANDARD_LIBRARY_SUPPORT)
     set(Coroutines_LIBRARY_SUPPORT ON)
 endif()
@@ -33,12 +33,4 @@ if(NOT CppcoroCoroutines_FOUND OR TARGET cppcoro::coroutines)
 endif()
 
 add_library(cppcoro::coroutines INTERFACE IMPORTED)
-if(Coroutines_SUPPORTS_MS_FLAG)
-    target_compile_options(cppcoro::coroutines INTERFACE /await)
-elseif(Coroutines_ts_SUPPORTS_GNU_FLAG)
-    target_compile_options(cppcoro::coroutines INTERFACE -fcoroutines-ts)
-elseif(Coroutines_SUPPORTS_GNU_FLAG)
-    target_compile_options(cppcoro::coroutines INTERFACE -fcoroutines)
-endif()
-
 target_compile_options(cppcoro::coroutines INTERFACE ${Coroutines_EXTRA_FLAGS})