ci: Fix build

labapart · Feb 21, 2024 · 5a6de9a · 5a6de9a
1 parent d533aeb
commit 5a6de9a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
@@ -26,6 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - run: sudo apt install libbluetooth-dev
       - run: ./ci/generate-python-package.sh
       - name: Archive Python packages
         uses: actions/upload-artifact@v4

diff --git a/dbus/CMakeLists.txt b/dbus/CMakeLists.txt
@@ -102,15 +102,18 @@ if(GATTLIB_PYTHON_INTERFACE)
   else()
     set(Python_USE_STATIC_LIBS TRUE)
   endif()
-  find_package(Python COMPONENTS Development.Module)
-  if (Python_Development.Module_FOUND)
-    include_directories(${Python_INCLUDE_DIRS})
-	  list(APPEND gattlib_LIBS ${Python_LIBRARIES})
-
-    add_definitions(-DWITH_PYTHON -DPYTHON_VERSION_MAJOR=${Python_VERSION_MAJOR} -DPYTHON_VERSION_MINOR=${Python_VERSION_MINOR})
-  else()
-    message(FATAL_ERROR "Could not find Python developer package")
+  find_package(Python COMPONENTS Interpreter Development)
+  if (NOT Python_Development_FOUND)
+    find_package(Python COMPONENTS Development.Module)
+    if (NOT Python_Development.Module_FOUND)
+      message(FATAL_ERROR "Could not find Python developer package")
+    endif()
   endif()
+
+  include_directories(${Python_INCLUDE_DIRS})
+  list(APPEND gattlib_LIBS ${Python_LIBRARIES})
+
+  add_definitions(-DWITH_PYTHON -DPYTHON_VERSION_MAJOR=${Python_VERSION_MAJOR} -DPYTHON_VERSION_MINOR=${Python_VERSION_MINOR})
 endif()
 
 # Gattlib