diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml index 4c001a0..e540daa 100644 --- a/.github/workflows/cpp.yml +++ b/.github/workflows/cpp.yml @@ -19,7 +19,7 @@ jobs: matrix: # Ubuntu-20.04 is being used here on purpose instead of ubuntu-latest due to a bug with clang and libstdc++ # https://github.com/actions/runner-images/issues/8659 - os: [ubuntu-20.04, windows-latest] + os: [ubuntu-20.04, windows-latest, macos-13, macos-13-xlarge] build_type: [Release] cpp_compiler: [g++, clang++, cl] exclude: @@ -29,6 +29,10 @@ jobs: cpp_compiler: clang++ - os: ubuntu-20.04 cpp_compiler: cl + - os: macos-13 + cpp_compiler: cl + - os: macos-13-xlarge + cpp_compiler: cl steps: - uses: actions/checkout@v3 diff --git a/cpp-tests/CMakeLists.txt b/cpp-tests/CMakeLists.txt index effd992..6f3ccd3 100644 --- a/cpp-tests/CMakeLists.txt +++ b/cpp-tests/CMakeLists.txt @@ -15,9 +15,12 @@ set(BINDINGS_SRC_DIR ${BINDINGS_BUILD_DIR}/bindings) if (WIN32) set(UNIFFI_FIXTURES_LIB uniffi_bindgen_cpp_fixtures.dll) set(ADDITIONAL_LIBS ws2_32 userenv advapi32 ntdll crypt32 Bcrypt) -else() +elseif(UNIX AND NOT APPLE) set(UNIFFI_FIXTURES_LIB libuniffi_bindgen_cpp_fixtures.so) set(ADDITIONAL_LIBS) +else() + set(UNIFFI_FIXTURES_LIB libuniffi_bindgen_cpp_fixtures.dylib) + set(ADDITIONAL_LIBS) endif() find_program(VALGRIND "valgrind")