From 3a27c54637bf66915d4ce5aac00a9212710e24df Mon Sep 17 00:00:00 2001 From: Peter Rindal Date: Mon, 29 Apr 2024 13:46:25 -0700 Subject: [PATCH] mac 20 --- .github/workflows/build-test.yml | 14 +++++++++++--- macoro/CMakeLists.txt | 11 ++++++----- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index f8fd6f3..4e2a146 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -97,11 +97,19 @@ jobs: submodules: recursive # Runs a set of commands using the runners shell - - name: build library + - name: build library 20 run: | - python3 build.py + python3 build.py -DMACORO_CPP_VER=20 - - name: unit test + - name: unit test 20 + run: | + ./out/build/osx/frontend/macoroFrontend -u + + - name: build library 14 + run: | + python3 build.py -DMACORO_CPP_VER=14 + + - name: unit test 14 run: | ./out/build/osx/frontend/macoroFrontend -u diff --git a/macoro/CMakeLists.txt b/macoro/CMakeLists.txt index 57fcb5f..1699180 100644 --- a/macoro/CMakeLists.txt +++ b/macoro/CMakeLists.txt @@ -65,11 +65,12 @@ else() CXX_EXTENSIONS NO ) endif() -if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND MACORO_CPP_20) - target_compile_options( macoro PUBLIC - "-fcoroutines" - ) -endif() +#if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND MACORO_CPP_20) +# target_compile_options( macoro PUBLIC +# "-fcoroutines" +# ) +#endif() + if(MACORO_ASAN) message("Warning: ASAN is enabled for macoro.") if(MSVC)