diff --git a/.github/workflows/build_cbsdk.yml b/.github/workflows/build_cbsdk.yml index 7c7d403..9ac034b 100644 --- a/.github/workflows/build_cbsdk.yml +++ b/.github/workflows/build_cbsdk.yml @@ -84,6 +84,9 @@ jobs: - name: Build Wheels shell: bash -el {0} run: | + if [[ "${{ matrix.config.name }}" = windows-x64 ]]; then + cp install/bin/Qt*.dll cerebus/ + fi conda create -n py39 python=3.9 numpy Cython pip wheel setuptools conda activate py39 pip wheel . -w dist/ diff --git a/.gitignore b/.gitignore index ed3cdd7..de3c57d 100644 --- a/.gitignore +++ b/.gitignore @@ -43,5 +43,6 @@ Release/ cerebus/cbpy.so cerebus/cbpy.cpp cerebus/cbpyw.cpp +cerebus/*.dll cmake-build*/ \ No newline at end of file diff --git a/BUILD.md b/BUILD.md index 068a5ed..8ccaa97 100644 --- a/BUILD.md +++ b/BUILD.md @@ -89,6 +89,8 @@ Note: This may generate an error related to the CLI builds. Please see further i * Windows: `set QTDIR=C:\Qt\6.5.2\msvc2019_64` * Mac: `set QTDIR==$(brew --prefix qt6)` * Windows: Close Visual Studio. +* Windows: Copy required Qt dlls into the cerebus tree so they get bundled in the wheel: + * `copy install\bin\Qt*.dll cerebus\` * Install locally: `pip install .` * or, if you are making a wheel to bring to another machine, * activate an environment matching the target machine, diff --git a/pyproject.toml b/pyproject.toml index 5509a6e..2c0e7b8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,6 +15,9 @@ urls = {homepage = "https://github.com/CerebusOSS/CereLink"} [tool.setuptools.packages.find] include = ["cerebus*"] # package names should match these glob patterns (["*"] by default) +[tool.setuptools.package-data] +cerebus = ["*.dll"] + [tool.setuptools.dynamic] version = {attr = "cerebus.__version__"} readme = {file = ["README.md"]}