diff --git a/.github/workflows/wheel-short-test.yml b/.github/workflows/wheel-short-test.yml index 9e1cb273..ddb83e2a 100644 --- a/.github/workflows/wheel-short-test.yml +++ b/.github/workflows/wheel-short-test.yml @@ -60,7 +60,7 @@ jobs: config = ["${{ matrix.config }}"] generator = "Ninja Multi-Config" [cmake.options] - CMAKE_FIND_ROOT_PATH = "$staging/pybind11;$staging/eigen-master" + CMAKE_FIND_ROOT_PATH = "$staging/pybind11-2.13.6;$staging/eigen-master" USE_GLOBAL_PYBIND11 = "On" EOF python${{ env.PYTHON_VERSION }} -m build -w . \ diff --git a/.github/workflows/wheel-upload.yml b/.github/workflows/wheel-upload.yml index 23af620e..ed7ec57c 100644 --- a/.github/workflows/wheel-upload.yml +++ b/.github/workflows/wheel-upload.yml @@ -58,7 +58,7 @@ jobs: -D CMAKE_CXX_COMPILER="$staging/x-tools/$host/bin/$host-g++" \ -D CMAKE_Fortran_COMPILER="$staging/x-tools/$host/bin/$host-gfortran" \ -D USE_GLOBAL_PYBIND11=On \ - -D CMAKE_FIND_ROOT_PATH="$staging/pybind11;$staging/eigen-master" + -D CMAKE_FIND_ROOT_PATH="$staging/pybind11-2.13.6;$staging/eigen-master" $pbc_cli -B native-build build -- -t ${{ env.C_EXTENSIONS }} $pbc_cli -B native-build install --component python_stubs -- --prefix "$PWD/staging/QPALM/interfaces/python" tar cf stubs.tar -C "$PWD/staging" QPALM/interfaces/python @@ -148,7 +148,7 @@ jobs: config = ["Debug", "Release"] generator = "Ninja Multi-Config" [cmake.options] - CMAKE_FIND_ROOT_PATH = "$staging/pybind11;$staging/eigen-master" + CMAKE_FIND_ROOT_PATH = "$staging/pybind11-2.13.6;$staging/eigen-master" USE_GLOBAL_PYBIND11 = "On" EOF python${{ matrix.python-version }} -m build -w . \ @@ -209,7 +209,7 @@ jobs: config = ["Debug"] generator = "Ninja Multi-Config" [cmake.options] - CMAKE_FIND_ROOT_PATH = "$staging/pybind11;$staging/eigen-master" + CMAKE_FIND_ROOT_PATH = "$staging/pybind11-2.13.6;$staging/eigen-master" USE_GLOBAL_PYBIND11 = "On" EOF python${{ env.PYTHON_VERSION }} -m build . \ diff --git a/conanfile.py b/conanfile.py index 77331ac5..fd951e5b 100644 --- a/conanfile.py +++ b/conanfile.py @@ -53,7 +53,7 @@ def requirements(self): if self.options.with_cxx: self.requires("eigen/3.4.0", transitive_headers=True) if self.options.with_python: - self.requires("pybind11/2.11.1") + self.requires("pybind11/2.13.6") def config_options(self): if self.settings.get_safe("os") == "Windows": diff --git a/scripts/ci/local-cross-build-wheel.sh b/scripts/ci/local-cross-build-wheel.sh index eda66228..7d328615 100755 --- a/scripts/ci/local-cross-build-wheel.sh +++ b/scripts/ci/local-cross-build-wheel.sh @@ -9,7 +9,7 @@ cat > $cross_config <<- EOF config = ["Debug", "Release"] generator = "Ninja Multi-Config" [cmake.options] -CMAKE_FIND_ROOT_PATH = "$staging/pybind11;$staging/eigen" +CMAKE_FIND_ROOT_PATH = "$staging/pybind11-2.13.6;$staging/eigen" USE_GLOBAL_PYBIND11 = "On" EOF export CFLAGS="-static-libgcc"