From 76353f865916a35502ce1d74cd2e0bacd7e6fb1e Mon Sep 17 00:00:00 2001 From: Olivier Martin Date: Tue, 9 Apr 2024 09:53:08 +0200 Subject: [PATCH] Do not build Python support by default and build examples by default --- .github/workflows/github-actions.yml | 6 +++--- CMakeLists.txt | 4 ++-- gattlib-py/setup.py | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index 6073c41..ccdfd90 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -6,14 +6,14 @@ jobs: steps: - uses: actions/checkout@v4 - run: sudo apt install libbluetooth-dev - - run: mkdir build && pushd build && cmake -DCMAKE_BUILD_TYPE=Debug .. && make + - run: mkdir build && pushd build && cmake -DCMAKE_BUILD_TYPE=Debug -DGATTLIB_PYTHON_INTERFACE=ON .. && make build-release: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - run: sudo apt install libbluetooth-dev doxygen - - run: mkdir build && pushd build && cmake -DCMAKE_BUILD_TYPE=Release -DGATTLIB_BUILD_DOCS=ON .. && make + - run: mkdir build && pushd build && cmake -DCMAKE_BUILD_TYPE=Release -DGATTLIB_BUILD_DOCS=ON -DGATTLIB_PYTHON_INTERFACE=ON .. && make - run: pushd build && cpack .. if: startsWith(github.ref, 'refs/tags/') env: @@ -41,7 +41,7 @@ jobs: steps: - uses: actions/checkout@v4 - run: sudo apt install libbluetooth-dev - - run: mkdir build && pushd build && cmake -DGATTLIB_FORCE_DBUS=TRUE -DCMAKE_BUILD_TYPE=Release .. && make + - run: mkdir build && pushd build && cmake -DGATTLIB_FORCE_DBUS=TRUE -DCMAKE_BUILD_TYPE=Release -DGATTLIB_PYTHON_INTERFACE=ON .. && make build-release-without-python-support: runs-on: ubuntu-latest diff --git a/CMakeLists.txt b/CMakeLists.txt index e1173c4..858ad81 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,10 +13,10 @@ include(CrossCompilation.cmake) project(gattlib) #TODO: Gattlib examples must be ported to new gattlib_connect() -option(GATTLIB_BUILD_EXAMPLES "Build GattLib examples" NO) +option(GATTLIB_BUILD_EXAMPLES "Build GattLib examples" YES) option(GATTLIB_SHARED_LIB "Build GattLib as a shared library" YES) option(GATTLIB_BUILD_DOCS "Build GattLib docs" NO) -option(GATTLIB_PYTHON_INTERFACE "Build GattLib Python Interface" YES) +option(GATTLIB_PYTHON_INTERFACE "Build GattLib Python Interface" NO) option(GATTLIB_ENABLE_ADDRESS_SANITIZER "Enable address sanitizer" NO) find_package(PkgConfig REQUIRED) diff --git a/gattlib-py/setup.py b/gattlib-py/setup.py index 830a363..753c009 100644 --- a/gattlib-py/setup.py +++ b/gattlib-py/setup.py @@ -77,6 +77,8 @@ class CMakeBuild(build_ext): f"-DCMAKE_LIBRARY_OUTPUT_DIRECTORY={cmake_library_output_dir}", f"-DPYTHON_EXECUTABLE={sys.executable}", f"-DCMAKE_BUILD_TYPE={cfg}", # not used on MSVC, but no harm + "-DGATTLIB_PYTHON_INTERFACE=ON", + "-DGATTLIB_BUILD_EXAMPLES=OFF", ] build_args = [] # Adding CMake arguments set as environment variable