diff options
| author | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2019-05-08 12:57:41 +0300 |
|---|---|---|
| committer | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2019-05-08 12:57:41 +0300 |
| commit | 719dcf500640f9b21eb4520744ff8e60d4b6d947 (patch) | |
| tree | c5ba72991159f801eb121f50cdd76b367c947c45 /CMakeLists.txt | |
| parent | d1f4429d43448daf0b79a6b414aff7c4ad12356b (diff) | |
Add VS2019 support, improve discard() support on older Windows, support Outcome v2.1.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b863b5e0..15caae4e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,7 @@ find_quickcpplib_library(quickcpplib 1.0 REQUIRED) find_quickcpplib_library(outcome 2.0 REQUIRED) find_quickcpplib_library(kerneltest 1.0 REQUIRED) if(WIN32) - add_subdirectory("include/llfio/ntkernel-error-category" EXCLUDE_FROM_ALL) + add_subdirectory("include/llfio/ntkernel-error-category" ) endif() # Make the standard static and shared libraries, and if supported by this compiler, C++ modules @@ -111,14 +111,14 @@ if(MSVC) CheckCXXHasCoroutines(_MSVC "/await") if(CXX_HAS_COROUTINES_MSVC) all_compile_options(PUBLIC "/await") - all_compile_definitions(PUBLIC "__cpp_coroutines") + all_compile_definitions(PUBLIC "LLFIO_HAVE_COROUTINES=1") endif() endif() if(CLANG OR GCC) CheckCXXHasCoroutines(_CLANG_GCC "-std=c++14 -fcoroutines-ts") if(CXX_HAS_COROUTINES_CLANG_GCC) all_compile_options(PUBLIC "-fcoroutines-ts") - all_compile_definitions(PUBLIC "__cpp_coroutines") + all_compile_definitions(PUBLIC "LLFIO_HAVE_COROUTINES=1") endif() endif() |