From 1ed340fcf13cefc73a1247c261bb8ad0aaced249 Mon Sep 17 00:00:00 2001
From: Alan Liddell <aliddell@chanzuckerberg.com>
Date: Mon, 2 Oct 2023 13:39:52 -0400
Subject: [PATCH] Prep for 0.1.7 release (#115)

- Updates changelog
- Don't build with SIMD support on OSX
---
 .github/workflows/release.yml | 13 ++-----------
 CHANGELOG.md                  |  6 +++++-
 cmake/simd.cmake              | 21 ++++++++++++---------
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ecd8b33..9e77b13 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -81,20 +81,11 @@ jobs:
 
       - uses: actions/checkout@v3
         with:
-          submodules: recursive
-
-      - name: Build
-        run: |
-          cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=Release
-          cmake --build ${{github.workspace}}/build --config Release
-
-      - name: Test  # don't release unless tests pass
-        working-directory: ${{github.workspace}}/build
-        run: ctest -C Release -L anyplatform --output-on-failure
+          submodules: true
 
       - name: Package
         run: |
-          cmake -B ${{github.workspace}}/pack -DCMAKE_BUILD_TYPE=Release -DNOTEST=1
+          cmake -B ${{github.workspace}}/pack -DCMAKE_BUILD_TYPE=Release -DNOTEST=1 -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64"
           cmake --build ${{github.workspace}}/pack --config Release
           cpack --config ${{github.workspace}}/pack/CPackConfig.cmake -C Release -G ZIP
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index daded92..20e273d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [0.1.7](https://github.com/acquire-project/acquire-driver-hdcam/compare/v0.1.6...v0.1.7) - 2023-10-02
+
+### Fixes
+
+- Driver builds as an OSX universal binary.
 
 ## [0.1.6](https://github.com/acquire-project/acquire-driver-hdcam/compare/v0.1.5...v0.1.6) - 2023-08-15
 
diff --git a/cmake/simd.cmake b/cmake/simd.cmake
index d94a069..40af7c7 100644
--- a/cmake/simd.cmake
+++ b/cmake/simd.cmake
@@ -1,12 +1,15 @@
 include(cmake/TargetArch.cmake)
 
 function(target_enable_simd tgt)
-    target_architecture(arch)
-    set(is_gcc_like "$<OR:$<COMPILE_LANG_AND_ID:CXX,AppleClang,Clang,GNU>,$<COMPILE_LANG_AND_ID:C,AppleClang,Clang,GNU>>")
-    set(is_msvc_like "$<OR:$<COMPILE_LANG_AND_ID:CXX,MSVC>,$<COMPILE_LANG_AND_ID:C,MSVC>>")
-    set(is_arch_x64 "$<STREQUAL:${arch},x86_64>")
-    target_compile_options(${tgt} PRIVATE
-            $<$<AND:${is_arch_x64},${is_gcc_like}>:-mavx2>
-            $<$<AND:${is_arch_x64},${is_msvc_like}>:/arch:AVX2>
-            )
-endfunction()
+    if(NOT APPLE)
+        # Broken on osx github runners for some reason
+        target_architecture(arch)
+        set(is_gcc_like "$<OR:$<COMPILE_LANG_AND_ID:CXX,AppleClang,Clang,GNU>,$<COMPILE_LANG_AND_ID:C,AppleClang,Clang,GNU>>")
+        set(is_msvc_like "$<OR:$<COMPILE_LANG_AND_ID:CXX,MSVC>,$<COMPILE_LANG_AND_ID:C,MSVC>>")
+        set(is_arch_x64 "$<STREQUAL:${arch},x86_64>")
+        target_compile_options(${tgt} PRIVATE
+                $<$<AND:${is_arch_x64},${is_gcc_like}>:-mavx2>
+                $<$<AND:${is_arch_x64},${is_msvc_like}>:/arch:AVX2>
+        )
+    endif()
+endfunction()
\ No newline at end of file