Merge pull request #102 from contour-terminal/fix/macOS-build

Fix SIMD scanning on macOS (using std::simd)

Author: Yaraslaut

.github/workflows/build.yml

@@ -57,6 +57,36 @@ jobs:
       - name: "test"
         run: ./build/src/libunicode/unicode_test
 
+  # {{{ macOS
+  osx:
+    name: "macOS"
+    runs-on: macos-14
+    steps:
+      - uses: actions/checkout@v4
+      - name: ccache
+        uses: hendrikmuhs/ccache-action@v1.2
+        with:
+          key: ccache-osx_qt${{ steps.set_vars.outputs.QTVER }}-r1
+          max-size: 256M
+      - name: "Install dependencies"
+        # Sometimes, brew thinks it needs to install from source rather than binary.
+        # For Qt this may take ages (many many hours). Let's not waste our CPU credits here,
+        # and limit the run time.
+        timeout-minutes: 15
+        run: |
+          set -ex
+          #brew update
+          ./scripts/install-deps.sh
+      - name: "Create build directory"
+        run: mkdir build
+      - name: "Generate build files"
+        run: cmake --preset macos-release
+      - name: "Build"
+        run: cmake --build --preset macos-release
+      - name: "Test"
+        run: ctest --preset macos-release
+  # }}}
+
   windows:
     name: "Windows"
     runs-on: windows-latest

scripts/install-deps.sh

@@ -194,6 +194,7 @@ install_deps_darwin()
     # catch2: available in brew, but too new (version 3+)
     brew install $SYSDEP_ASSUME_YES \
         fmt \
+        ninja \
         pkg-config \
         range-v3
 }

src/libunicode/scan.cpp

@@ -23,7 +23,7 @@
 #include <string_view>
 
 // clang-format off
-#if __has_include(<experimental/simd>) && defined(LIBUNICODE_USE_STD_SIMD)
+#if __has_include(<experimental/simd>) && defined(LIBUNICODE_USE_STD_SIMD) && !defined(__APPLE__)
     #define USE_STD_SIMD
     #include <experimental/simd>
     namespace stdx = std::experimental;