V3 develop

.github/workflows/.dev.workflow.yml

@@ -3,91 +3,124 @@ name: Dev Workflow
 on:
   push:
     branches-ignore:
-      - xlink_upstream
+      [xlink_upstream]
   pull_request:
     branches-ignore:
-      - xlink_upstream
+      [xlink_upstream]
 
 jobs:
   build:
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
         compiler: [default, clang]
-        libusb: [ON, OFF]
-        include:
-          - os: windows-latest
-            compiler: mingw
-            libusb: ON
-          - os: windows-latest
-            compiler: mingw
-            libusb: OFF
+        enable-libusb: [ON, OFF]
+        libusb-system: [ON, OFF]
+        exclude:
+        # libusb-system is only valid on macOS & Ubuntu
+        - os: windows-latest
+          libusb-system: ON
+        # clang is only valid on macOS & Ubuntu
+        - os: windows-latest
+          compiler: clang
+        # Prevent meaningless combos where libusb-system ON but libusb disabled
+        - enable-libusb: OFF
+          libusb-system: ON
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: 'recursive'
 
-    - name: Install libusb
-      if: matrix.os == 'macos-latest' && matrix.libusb == 'ON'
+    # Install system libusb only when requested AND on supported OSes
+    - name: Install libusb (macOS)
+      if: matrix.os == 'macos-latest' && matrix['libusb-system'] == 'ON'
       run: |
         brew install libusb
 
-    - name: Install libusb
-      if: matrix.os == 'ubuntu-latest' && matrix.libusb == 'ON'
+    - name: Install libusb (Ubuntu)
+      if: matrix.os == 'ubuntu-latest' && matrix['libusb-system'] == 'ON'
       run: |
-        sudo apt-get install libusb-1.0-0-dev libusb-1.0-0
+        sudo apt-get update
+        sudo apt-get install -y libusb-1.0-0-dev libusb-1.0-0
 
-    - name: Setup MinGW compiler
-      if: matrix.compiler == 'mingw'
-      run: |
-        choco install mingw
-        choco upgrade mingw
-
-    - name: Install Clang on macOS
-      if: matrix.os == 'macos-latest' && matrix.compiler == 'clang'
-      run: |
-        brew install llvm
-        echo "/usr/local/opt/llvm/bin" >> $GITHUB_PATH
-
-    - name: Install Clang on Ubuntu
-      if: matrix.os == 'ubuntu-latest' && matrix.compiler == 'clang'
-      run: |
-        sudo apt-get install clang
-
-    - name: Install Clang on Windows
-      if: matrix.os == 'windows-latest' && matrix.compiler == 'clang'
-      run: |
-        choco install llvm
-        echo "C:\Program Files\LLVM\bin" >> $env:GITHUB_PATH
-
-    - name: Install Ninja on macOS
-      if: matrix.os == 'macos-latest'
-      run: |
-        brew install ninja
-
-    - name: Install Ninja on Ubuntu
-      if: matrix.os == 'ubuntu-latest'
+    # --- Local libusb when SYSTEM_LIBUSB=OFF but libusb is enabled ---
+    - name: Build & install local libusb (all OSes)
+      if: matrix['enable-libusb'] == 'ON' && matrix['libusb-system'] == 'OFF'
+      shell: bash
       run: |
-        sudo apt-get install ninja-build
+        set -euxo pipefail
+        # Where to install local libusb
+        PREFIX="${GITHUB_WORKSPACE}/.local/libusb"
+        mkdir -p "${PREFIX}"
+
+        # Get libusb (shallow)
+        git clone --depth=1 https://github.com/luxonis/libusb.git --branch cmake-android-mainline
+        cmake -S libusb -B build-libusb \
+          -DCMAKE_BUILD_TYPE=Release \
+          -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
+          -DWITH_UDEV=OFF \
+          -DBUILD_SHARED_LIBS=ON
+        cmake --build build-libusb --config Release --parallel
+        cmake --build build-libusb --config Release --target install
+
+        # Export usb-1.0_DIR for later CMake configure
+        # (CMake package config is placed here by libusb)
+        echo "USB1_DIR=${PREFIX}/lib/cmake/usb-1.0" >> "$GITHUB_ENV"
 
-    - name: Install Ninja on Windows
-      if: matrix.os == 'windows-latest'
+    - name: Setup MinGW compiler
+      if: matrix.compiler == 'mingw'
       run: |
-        choco install ninja
-
-    - name: configure
-      if: matrix.compiler == 'default'
-      run: cmake . -Bbuild -DXLINK_BUILD_EXAMPLES=ON -DXLINK_BUILD_TESTS=ON -DXLINK_ENABLE_LIBUSB=${{ matrix.libusb }}
-
-    - name: configure
+        choco install -y mingw
+        choco upgrade -y mingw
+
+    # Configure (Debug)
+    - name: configure (Debug) - default/clang
+      if: matrix.compiler == 'default' || matrix.compiler == 'clang'
+      shell: bash
+      run: >
+        cmake . -Bbuild
+        -DXLINK_BUILD_EXAMPLES=ON
+        -DXLINK_BUILD_TESTS=ON
+        -DXLINK_ENABLE_LIBUSB=${{ matrix['enable-libusb'] }}
+        -DXLINK_LIBUSB_SYSTEM=${{ matrix['libusb-system'] }}
+        -D"usb-1.0_DIR=$USB1_DIR"
+
+    - name: configure (Debug) - MinGW
       if: matrix.compiler == 'mingw'
-      run: cmake . -Bbuild -DXLINK_BUILD_EXAMPLES=ON -DXLINK_BUILD_TESTS=ON -DXLINK_ENABLE_LIBUSB=${{ matrix.libusb }} -G"MinGW Makefiles"
-
-    - name: configure
-      if: matrix.compiler == 'clang'
-      run: cmake . -Bbuild -DXLINK_BUILD_EXAMPLES=ON -DXLINK_BUILD_TESTS=ON -DXLINK_ENABLE_LIBUSB=${{ matrix.libusb }} -G"Ninja" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
-
-    - name: build
-      run: cmake --build build --parallel
+      shell: bash
+      run: >
+        cmake . -Bbuild
+        -DXLINK_BUILD_EXAMPLES=ON
+        -DXLINK_BUILD_TESTS=ON
+        -DXLINK_ENABLE_LIBUSB=${{ matrix['enable-libusb'] }}
+        -DXLINK_LIBUSB_SYSTEM=${{ matrix['libusb-system'] }}
+        -D"usb-1.0_DIR=$USB1_DIR"
+        -G "MinGW Makefiles"
+
+    - name: build (Debug)
+      run: cmake --build build --parallel --config Debug
+
+    - name: test (Debug)
+      shell: bash
+      run: ctest --test-dir build -C Debug --output-on-failure
+
+    - name: reconfigure (Release)
+      shell: bash
+      run: >
+        cmake . -Bbuild
+        -DCMAKE_BUILD_TYPE=Release
+        -DXLINK_BUILD_EXAMPLES=ON
+        -DXLINK_BUILD_TESTS=ON
+        -DXLINK_ENABLE_LIBUSB=${{ matrix['enable-libusb'] }}
+        -DXLINK_LIBUSB_SYSTEM=${{ matrix['libusb-system'] }}
+        -D"usb-1.0_DIR=$USB1_DIR"
+
+    - name: build (Release)
+      run: cmake --build build --parallel --config Release
+
+    - name: test (Release)
+      shell: bash
+      run: ctest --test-dir build -C Release --output-on-failure

.gitignore

@@ -3,6 +3,9 @@ build/
 build*/
 .cache*
 
+#clangd
+.cache/*
+
 #git
 *.orig
 *_REMOTE_*

CMakeLists.txt

@@ -4,12 +4,6 @@
 
 cmake_minimum_required(VERSION 3.10)
 
-include("cmake/HunterGate.cmake")
-HunterGate(
-    URL "https://github.com/cpp-pm/hunter/archive/9d9242b60d5236269f894efd3ddd60a9ca83dd7f.tar.gz"
-    SHA1 "16cc954aa723bccd16ea45fc91a858d0c5246376"
-    LOCAL # Local config for dependencies
-)
 
 ### Constants
 set(TARGET_NAME "XLink")
@@ -20,21 +14,14 @@ project(${TARGET_NAME} LANGUAGES C CXX)
 
 set(PROJECT_EXPORT_GROUP "${PROJECT_NAME}Targets")
 
-# Set default installation directory
-if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-    set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "Installation Directory" FORCE)
-endif()
-
 # Compile with USB protocol capabilities
 option(XLINK_ENABLE_LIBUSB "Enable USB protocol which requires libusb library" ON)
 # Build examples
 option(XLINK_BUILD_EXAMPLES "Build XLink examples" OFF)
 # Build tests
 option(XLINK_BUILD_TESTS "Build XLink tests" OFF)
-# Debug option
-set(XLINK_LIBUSB_LOCAL "" CACHE STRING "Path to local libub source to use instead of Hunter")
-# Debug option
-option(XLINK_LIBUSB_SYSTEM "Use system libusb library instead of Hunter" OFF)
+# Install headers only (skip binary lib in install tree)
+option(XLINK_INSTALL_PUBLIC_ONLY "Install only header interface target (XLinkPublic)" OFF)
 
 # Specify exporting all symbols on Windows
 if(WIN32 AND BUILD_SHARED_LIBS)
@@ -65,6 +52,7 @@ get_cmake_property(is_multi_config GENERATOR_IS_MULTI_CONFIG)
 if(is_multi_config)
     set_target_properties(${TARGET_NAME} PROPERTIES DEBUG_POSTFIX "d")
 endif()
+
 # Define export header to support shared library on Windows
 include(GenerateExportHeader)
 generate_export_header(${TARGET_NAME}
@@ -89,13 +77,12 @@ if(XLINK_ENABLE_LIBUSB)
     else()
         # Link to CMake libusb
         target_link_libraries(${TARGET_NAME} PRIVATE usb-1.0)
-        if(WIN32 AND CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+        if(WIN32 AND NOT MINGW)
             target_link_libraries(${TARGET_NAME} PRIVATE delayimp.lib)
             # workaround https://gitlab.kitware.com/cmake/cmake/-/issues/20022
 	    target_link_options(${TARGET_NAME} PUBLIC "$<LINK_ONLY:/DELAYLOAD:libusb-1.0$<$<CONFIG:Debug>:d>.dll>")
         endif()
     endif()
-
     if(WIN32 AND NOT MINGW)
         target_link_libraries(${TARGET_NAME} PRIVATE Pathcch.lib)
     endif()
@@ -157,15 +144,9 @@ target_compile_definitions(${TARGET_NAME}
         USE_TCP_IP
 )
 
-if (ENABLE_MYRIAD_NO_BOOT)
-    target_compile_definitions(${TARGET_NAME}
-        PRIVATE
-        NO_BOOT)
-endif()
 
-# Set C99 standard
+# Set C99 and C++11 standard
 set_property(TARGET ${TARGET_NAME} PROPERTY C_STANDARD 99)
-# Set compiler features (c++11), and disables extensions (g++11)
 set_property(TARGET ${TARGET_NAME} PROPERTY CXX_STANDARD 11)
 set_property(TARGET ${TARGET_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
 set_property(TARGET ${TARGET_NAME} PROPERTY CXX_EXTENSIONS OFF)
@@ -220,17 +201,18 @@ endif()
 
 include(GNUInstallDirs)
 
+# Handle public-only install option
+set(_XLINK_INSTALL_TARGETS ${TARGET_PUBLIC_NAME})
+if(NOT XLINK_INSTALL_PUBLIC_ONLY)
+    list(APPEND _XLINK_INSTALL_TARGETS ${TARGET_NAME})
+endif()
+
 # Export targets (capability to import current build directory)
 export(TARGETS ${TARGET_NAME} ${TARGET_PUBLIC_NAME} FILE "${PROJECT_NAME}Targets.cmake")
 
 # Dependencies file
 configure_file("cmake/${PROJECT_NAME}Dependencies.cmake" ${PROJECT_NAME}Dependencies.cmake COPYONLY)
 
-# Configure config file (one for exporting build directory, one for installation)
-if(${HUNTER_INSTALL_PREFIX})
-    file(RELATIVE_PATH XLINK_DEPENDENCIES_INSTALLATION_PATH_REL "${CMAKE_CURRENT_BINARY_DIR}" "${HUNTER_INSTALL_PREFIX}")
-endif()
-
 configure_file(cmake/${PROJECT_NAME}Config.cmake.in ${PROJECT_NAME}Config.cmake @ONLY)
 
 # Config for installation
@@ -239,7 +221,7 @@ configure_file(cmake/${PROJECT_NAME}Config.cmake.in _install/${PROJECT_NAME}Conf
 
 # Install targets
 install(
-    TARGETS ${TARGET_NAME} ${TARGET_PUBLIC_NAME}
+    TARGETS ${_XLINK_INSTALL_TARGETS}
     EXPORT ${PROJECT_EXPORT_GROUP}
     RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
     LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
@@ -252,13 +234,6 @@ install(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_NAME}Export.h
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/XLink
 )
-
-# Install Hunter dependencies
-if(XLINK_ENABLE_LIBUSB)
-    if(NOT XLINK_LIBUSB_LOCAL AND NOT XLINK_LIBUSB_SYSTEM)
-        install(DIRECTORY "${HUNTER_INSTALL_PREFIX}/" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/dependencies")
-    endif()
-endif()
 # Install export group (information about targets)
 install(EXPORT ${PROJECT_EXPORT_GROUP}
     DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"