Skip to content

Commit

Permalink
MAINT: Address review comments
Browse files Browse the repository at this point in the history
Also drop hopefully unnecessary brew work for macos

Co-authored-by: Eli Schwartz <eschwartz@archlinux.org>
  • Loading branch information
HaoZeke and eli-schwartz committed Jul 2, 2023
1 parent 688272b commit 11b7362
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
3 changes: 1 addition & 2 deletions highspy/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ py_mod = import('python')
py = py_mod.find_installation(pure: false)
pyb11_dep = [
py.dependency(),
dependency('pybind11',
required: true)
dependency('pybind11')
]
_deps += pyb11_dep

Expand Down
6 changes: 4 additions & 2 deletions meson.build
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
project('highs', 'cpp',
version : '1.5.3',
default_options : ['warning_level=1', 'cpp_std=c++17'])
default_options : ['warning_level=1',
'cpp_std=c++17',
'wrap_mode=forcefallback'])


# Add C++ compiler options
Expand Down Expand Up @@ -105,7 +107,7 @@ if get_option('with_tests')
endif

# --------------------- Bindings

if get_option('with_pybind11')
subproject('pybind11')
subdir('highspy')
endif
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ build-backend = "mesonpy"
[tool.meson-python.args]
setup = ['-Dwith_pybind11=True',
'-Dhighsint64=False',
'-Dwrap_mode=forcefallback'
]
dist = ['--include-subprojects']

Expand All @@ -39,7 +40,6 @@ repair-wheel-command = "auditwheel repair -w {dest_dir} {wheel}"
[tool.cibuildwheel.macos]
archs = ["x86_64 arm64"]
environment = { RUNNER_OS="macOS" }
before-all = "brew install pkg-config && brew install pybind11"

# [tool.cibuildwheel.windows]
# archs = ["AMD64"]
Expand Down

0 comments on commit 11b7362

Please sign in to comment.