Merge branch 'master' into hid_read_error

libusb · Mar 4, 2025 · ccfbe48 · ccfbe48
2 parents 329d30c + 122ecb0
commit ccfbe48
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 19 deletions.
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -8,24 +8,12 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
+      - name: Install Doxygen
+        run: sudo apt satisfy "doxygen (>= 1.9.6)"
 
-      - name: Install Doxygen static libclang deps
-        run: sudo apt-get install libclang1-12 libclang-cpp12
-
-      - name: Install Doxygen from SF binary archives
-        env:
-          DOXYGEN_VERSION: '1.9.6'
-        run: |
-          mkdir .doxygen && cd .doxygen
-          curl -L https://sourceforge.net/projects/doxygen/files/rel-$DOXYGEN_VERSION/doxygen-$DOXYGEN_VERSION.linux.bin.tar.gz > doxygen.tar.gz
-          gunzip doxygen.tar.gz
-          tar xf doxygen.tar
-          cd doxygen-$DOXYGEN_VERSION
-          sudo make install
-
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - run: doxygen
         working-directory: doxygen
@@ -37,7 +25,7 @@ jobs:
           path: ${{ github.workspace }}/doxygen/html
 
   deploy-docs:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: [build]
     if: github.ref_type == 'branch' && github.ref_name == 'master'
     concurrency:
@@ -51,7 +39,7 @@ jobs:
           path: docs
 
       - name: upload to github pages
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./docs

diff --git a/mac/CMakeLists.txt b/mac/CMakeLists.txt
@@ -21,11 +21,27 @@ set_target_properties(hidapi_darwin
         OUTPUT_NAME "hidapi"
         VERSION ${PROJECT_VERSION}
         SOVERSION ${PROJECT_VERSION_MAJOR}
-        MACHO_COMPATIBILITY_VERSION ${PROJECT_VERSION_MAJOR}
         FRAMEWORK_VERSION ${PROJECT_VERSION_MAJOR}
         PUBLIC_HEADER "${HIDAPI_PUBLIC_HEADERS}"
 )
 
+if(NOT CMAKE_VERSION VERSION_LESS 3.17)
+    option(HIDAPI_USE_LEGACY_COMPATIBILITY_VERSION "Legacy Autotools build system hard-coded 1.0.0 for compatibility version" FALSE)
+    if(HIDAPI_USE_LEGACY_COMPATIBILITY_VERSION)
+        # TODO: v1: remove this workaround
+        set_target_properties(hidapi_darwin
+            PROPERTIES
+                MACHO_COMPATIBILITY_VERSION "1.0.0"
+                MACHO_CURRENT_VERSION "1.0.0"
+        )
+    else()
+        set_target_properties(hidapi_darwin
+            PROPERTIES
+                MACHO_COMPATIBILITY_VERSION ${PROJECT_VERSION_MAJOR}
+        )
+    endif()
+endif()
+
 # compatibility with find_package()
 add_library(hidapi::darwin ALIAS hidapi_darwin)
 # compatibility with raw library link