diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 601533c..4136af2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,7 +80,7 @@ jobs: submodules: recursive - name: CMake - run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{matrix.build_type}} + run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" - name: Build run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ebe95d2..9e77b13 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -55,7 +55,7 @@ jobs: - 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 @@ -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 a251cce..044af36 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. ### Added 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 "$,$>") - set(is_msvc_like "$,$>") - set(is_arch_x64 "$") - target_compile_options(${tgt} PRIVATE - $<$:-mavx2> - $<$:/arch:AVX2> - ) -endfunction() + if(NOT APPLE) + # Broken on osx github runners for some reason + target_architecture(arch) + set(is_gcc_like "$,$>") + set(is_msvc_like "$,$>") + set(is_arch_x64 "$") + target_compile_options(${tgt} PRIVATE + $<$:-mavx2> + $<$:/arch:AVX2> + ) + endif() +endfunction() \ No newline at end of file diff --git a/src/acquire-core-libs b/src/acquire-core-libs index 799d0c9..40e71b2 160000 --- a/src/acquire-core-libs +++ b/src/acquire-core-libs @@ -1 +1 @@ -Subproject commit 799d0c95a4e303e6855353143c5311c6bdbfbcc6 +Subproject commit 40e71b2af97f8827be5d88352414365193145ed3 diff --git a/tests/acquire-driver-common b/tests/acquire-driver-common index 4adedc9..948427a 160000 --- a/tests/acquire-driver-common +++ b/tests/acquire-driver-common @@ -1 +1 @@ -Subproject commit 4adedc9a4851645727034e64b30f56ae4c223bd1 +Subproject commit 948427af73fe62796d40db6374af5d5d5712abf9 diff --git a/tests/acquire-video-runtime b/tests/acquire-video-runtime index 773a6f5..16ae2a3 160000 --- a/tests/acquire-video-runtime +++ b/tests/acquire-video-runtime @@ -1 +1 @@ -Subproject commit 773a6f5e863e4356c2d19666b5a12fde133dbaba +Subproject commit 16ae2a399f0fac3a1de5a66971e7bca594345ce1