Fix Windows CI

.github/workflows/build.yml

@@ -1,39 +1,39 @@
 name: Build
 
 on:
-    push:
-        branches:
-            - main
+  push:
+    branches:
+      - main
 
 jobs:
-    build:
-        strategy:
-            matrix:
-                platform: [windows-latest, macos-latest, ubuntu-latest]
+  build:
+    strategy:
+      matrix:
+        platform: [ windows-latest, macos-latest, ubuntu-latest ]
 
-        runs-on: ${{matrix.platform}}
-        steps:
-            - uses: actions/checkout@v3
-              with:
-                  submodules: recursive
+    runs-on: ${{matrix.platform}}
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: true
 
-            - name: Build (macOS)
-              if: matrix.platform == 'macos-latest'
-              uses: messense/maturin-action@v1
-              with:
-                command: build
-                target: universal2-apple-darwin
-                args: --release -o dist
+      - name: Build (macOS)
+        if: matrix.platform == 'macos-latest'
+        uses: messense/maturin-action@v1
+        with:
+          command: build
+          target: universal2-apple-darwin
+          args: --release -o dist
 
-            - name: Build
-              if: matrix.platform != 'macos-latest'
-              uses: messense/maturin-action@v1
-              with:
-                command: build
-                args: --release -o dist
+      - name: Build
+        if: matrix.platform != 'macos-latest'
+        uses: messense/maturin-action@v1
+        with:
+          command: build
+          args: --release -o dist
 
-            - name: Upload wheels
-              uses: actions/upload-artifact@v3
-              with:
-                  name: ${{matrix.platform}} wheels
-                  path: dist
+      - name: Upload wheels
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{matrix.platform}} wheels
+          path: dist

.github/workflows/release.yml

@@ -34,7 +34,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           ref: main
-          submodules: recursive
+          submodules: true
 
       - name: Set up Python ${{ matrix.python }}
         uses: actions/setup-python@v4
@@ -46,7 +46,7 @@ jobs:
         run: |
           git fetch --tags
           git checkout nightly
-          git submodule update --recursive
+          git submodule update
         working-directory: ${{github.workspace}}/acquire-video-runtime
 
       - name: Set config to pull nightly drivers

.github/workflows/test_pr.yml

@@ -16,8 +16,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [ "windows-latest", "ubuntu-latest", "macos-latest" ]
-        python: [ "3.8", "3.9", "3.10" ]
+        platform:
+          - windows-latest
+          - ubuntu-latest
+          - macos-latest
+        python:
+          - 3.8
+          - 3.9
+          - 3.10
 
     permissions:
       actions: write
@@ -31,7 +37,7 @@ jobs:
 
       - uses: actions/checkout@v3
         with:
-          submodules: recursive
+          submodules: true
           ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Set up Python ${{ matrix.python }}
@@ -72,7 +78,7 @@ jobs:
 
       - uses: actions/checkout@v3
         with:
-          submodules: recursive
+          submodules: true
           ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Get CMake 3.24
@@ -118,7 +124,7 @@ jobs:
 
       - uses: actions/checkout@v3
         with:
-          submodules: recursive
+          submodules: true
           ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Get CMake 3.24
@@ -148,7 +154,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          submodules: recursive
+          submodules: true
           ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Set up Python 3.10

.gitmodules

@@ -1,4 +1,7 @@
 [submodule "acquire-video-runtime"]
-	path = acquire-video-runtime
+	path = acquire-libs/acquire-video-runtime
 	url = ../acquire-video-runtime.git
 	branch = main
+[submodule "acquire-libs/acquire-core-libs"]
+	path = acquire-libs/acquire-core-libs
+	url = ../acquire-core-libs.git

acquire-libs/CMakeLists.txt

@@ -0,0 +1,8 @@
+function(aq_require tgt)
+    if(NOT TARGET ${tgt})
+        add_subdirectory(${tgt})
+    endif()
+endfunction()
+
+aq_require(acquire-core-libs)
+aq_require(acquire-video-runtime)

build.rs

@@ -12,15 +12,15 @@ struct DriverManifest {
 }
 
 fn main() {
-    let dst = dbg!(cmake::Config::new("acquire-video-runtime")
+    let dst = cmake::Config::new("acquire-libs")
         .target("acquire-video-runtime")
         .profile("RelWithDebInfo")
         .static_crt(true)
         .define("NOTEST", "TRUE")
         .define("NO_UNIT_TESTS", "TRUE")
         .define("NO_EXAMPLES", "TRUE")
         .define("CMAKE_OSX_DEPLOYMENT_TARGET", "10.15")
-        .build());
+        .build();
 
     let drivers_json = fs::read_to_string("drivers.json")
         .expect("Failed to read from drivers.json.");