From 2f3ec2a90de2992f3a33bd27704b144e0f65436b Mon Sep 17 00:00:00 2001 From: Alan Liddell Date: Wed, 13 Dec 2023 10:23:56 -0500 Subject: [PATCH] Update some drivers for OSX universal builds (#134) The versions for `acquire-driver-common`, `acquire-driver-hdcam`, and `acquire-driver-egrabber` were out of date. This PR updates them and thereby fixes a regression where Acquire can't be imported on ARM Macs. --- Cargo.toml | 2 +- build.rs | 1 + drivers.json | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 756c48f..0668519 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "acquire-imaging" authors = ["Nathan Clack "] -version = "0.2.1" +version = "0.2.2" edition = "2021" [lib] diff --git a/build.rs b/build.rs index 26ceed5..cbebd98 100644 --- a/build.rs +++ b/build.rs @@ -21,6 +21,7 @@ fn main() { .define("NO_UNIT_TESTS", "TRUE") .define("NO_EXAMPLES", "TRUE") .define("CMAKE_OSX_DEPLOYMENT_TARGET", "10.15") + .define("CMAKE_OSX_ARCHITECTURES", "x86_64;arm64") .build(); let drivers_json = diff --git a/drivers.json b/drivers.json index 45a06dd..64c033c 100644 --- a/drivers.json +++ b/drivers.json @@ -1,7 +1,7 @@ { - "acquire-driver-common": "0.1.5", + "acquire-driver-common": "0.1.6", "acquire-driver-zarr": "0.1.7", - "acquire-driver-egrabber": "0.1.4", - "acquire-driver-hdcam": "0.1.6", + "acquire-driver-egrabber": "0.1.5", + "acquire-driver-hdcam": "0.1.7", "acquire-driver-spinnaker": "0.1.1" }