More tweaks

Author: themarpe

.github/workflows/.dev.workflow.yml

@@ -17,24 +17,24 @@ jobs:
         os: [macos-latest, windows-latest, ubuntu-latest]
         compiler: [default, clang]
         enable-libusb: [ON, OFF]
-        system-libusb: [ON, OFF]
+        libusb-system: [ON, OFF]
         include:
-          # Add MinGW builds on Windows with system-libusb forced OFF
+          # Add MinGW builds on Windows with libusb-system forced OFF
           - os: windows-latest
             compiler: mingw
             enable-libusb: ON
-            system-libusb: OFF
+            libusb-system: OFF
           - os: windows-latest
             compiler: mingw
             enable-libusb: OFF
-            system-libusb: OFF
+            libusb-system: OFF
         exclude:
-          # system-libusb is only valid on macOS & Ubuntu
+          # libusb-system is only valid on macOS & Ubuntu
           - os: windows-latest
-            system-libusb: ON
-          # Prevent meaningless combos where system-libusb ON but libusb disabled
+            libusb-system: ON
+          # Prevent meaningless combos where libusb-system ON but libusb disabled
           - enable-libusb: OFF
-            system-libusb: ON
+            libusb-system: ON
 
     steps:
     - uses: actions/checkout@v4
@@ -43,19 +43,19 @@ jobs:
 
     # Install system libusb only when requested AND on supported OSes
     - name: Install libusb (macOS)
-      if: matrix.os == 'macos-latest' && matrix['system-libusb'] == 'ON'
+      if: matrix.os == 'macos-latest' && matrix['libusb-system'] == 'ON'
       run: |
         brew install libusb
 
     - name: Install libusb (Ubuntu)
-      if: matrix.os == 'ubuntu-latest' && matrix['system-libusb'] == 'ON'
+      if: matrix.os == 'ubuntu-latest' && matrix['libusb-system'] == 'ON'
       run: |
         sudo apt-get update
         sudo apt-get install -y libusb-1.0-0-dev libusb-1.0-0
 
     # --- Local libusb when SYSTEM_LIBUSB=OFF but libusb is enabled ---
     - name: Build & install local libusb (all OSes)
-      if: matrix['enable-libusb'] == 'ON' && matrix['system-libusb'] == 'OFF'
+      if: matrix['enable-libusb'] == 'ON' && matrix['libusb-system'] == 'OFF'
       shell: bash
       run: |
         set -euxo pipefail
@@ -92,7 +92,7 @@ jobs:
         -DXLINK_BUILD_EXAMPLES=ON
         -DXLINK_BUILD_TESTS=ON
         -DXLINK_ENABLE_LIBUSB=${{ matrix['enable-libusb'] }}
-        -DXLINK_SYSTEM_LIBUSB=${{ matrix['system-libusb'] }}
+        -DXLINK_LIBUSB_SYSTEM=${{ matrix['libusb-system'] }}
         -D"usb-1.0_DIR=$USB1_DIR"
 
     - name: configure (Debug) - MinGW
@@ -103,7 +103,7 @@ jobs:
         -DXLINK_BUILD_EXAMPLES=ON
         -DXLINK_BUILD_TESTS=ON
         -DXLINK_ENABLE_LIBUSB=${{ matrix['enable-libusb'] }}
-        -DXLINK_SYSTEM_LIBUSB=${{ matrix['system-libusb'] }}
+        -DXLINK_LIBUSB_SYSTEM=${{ matrix['libusb-system'] }}
         -D"usb-1.0_DIR=$USB1_DIR"
         -G "MinGW Makefiles"
 
@@ -122,7 +122,7 @@ jobs:
         -DXLINK_BUILD_EXAMPLES=ON
         -DXLINK_BUILD_TESTS=ON
         -DXLINK_ENABLE_LIBUSB=${{ matrix['enable-libusb'] }}
-        -DXLINK_SYSTEM_LIBUSB=${{ matrix['system-libusb'] }}
+        -DXLINK_LIBUSB_SYSTEM=${{ matrix['libusb-system'] }}
         -D"usb-1.0_DIR=$USB1_DIR"
 
     - name: build (Release)