From bc5b13d8c4505b849f15638cb524d64832730a9b Mon Sep 17 00:00:00 2001 From: Mark Turner Date: Thu, 29 Feb 2024 16:32:33 +0100 Subject: [PATCH] remove lib64 --- pyproject.toml | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index af394a39e..99a00bef0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -48,7 +48,7 @@ before-all = [ "unzip scip.zip", "mv scip_install scip" ] -environment = { SCIPOPTDIR="$(pwd)/scip", LD_LIBRARY_PATH="$(pwd)/scip/lib:$(pwd)/scip/lib64:$LD_LIBRARY_PATH", DYLD_LIBRARY_PATH="$(pwd)/scip/lib:$(pwd)/scip/lib64:$DYLD_LIBRARY_PATH", PATH="$(pwd)/scip/bin:$PATH", PKG_CONFIG_PATH="$(pwd)/scip/lib/pkgconfig:$PKG_CONFIG_PATH"} +environment = { SCIPOPTDIR="$(pwd)/scip", LD_LIBRARY_PATH="$(pwd)/scip/lib:$LD_LIBRARY_PATH", DYLD_LIBRARY_PATH="$(pwd)/scip/lib:$DYLD_LIBRARY_PATH", PATH="$(pwd)/scip/bin:$PATH", PKG_CONFIG_PATH="$(pwd)/scip/lib/pkgconfig:$PKG_CONFIG_PATH"} [tool.cibuildwheel.macos] diff --git a/setup.py b/setup.py index 6c607648c..099bb66fd 100644 --- a/setup.py +++ b/setup.py @@ -126,6 +126,6 @@ ext_modules=extensions, packages=["pyscipopt"], package_dir={"pyscipopt": packagedir}, - package_data={"pyscipopt": ["scip.pyx", "scip.pxd", "*.pxi", "scip/lib/*", "scip/lib64/*"]}, + package_data={"pyscipopt": ["scip.pyx", "scip.pxd", "*.pxi", "scip/lib/*"]}, include_package_data=True, )