Skip to content

Commit 5c0f6f1

Browse files
committed
BLD: Use suppressions from HiGHS instead
1 parent 71a5612 commit 5c0f6f1

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

scipy/optimize/_highs/meson.build

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,15 @@ highs_args = highs_proj.get_variable('_args')
1818
highs_deps = highs_proj.get_variable('_deps')
1919
highslib_srcs = highs_proj.get_variable('highslib_srcs')
2020
highs_incdirs = highs_proj.get_variable('_incdirs')
21+
highs_cpp_suppressions = highs_proj.get_variable('_highs_cpp_suppressions')
22+
highs_c_suppressions = highs_proj.get_variable('_highs_c_suppressions')
2123

2224
_highslib = static_library(
2325
'highs',
2426
highslib_srcs,
2527
dependencies: highs_deps,
26-
cpp_args: highs_args,
27-
c_args: highs_args,
28+
cpp_args: highs_cpp_suppressions,
29+
c_args: highs_c_suppressions,
2830
include_directories: highs_incdirs,
2931
# Ensure that if we link a static library into a shared library,
3032
# private symbols don't get re-exported.
@@ -54,8 +56,6 @@ py3.extension_module(
5456
'_core',
5557
sources: highspy_cpp + highs_conf_file,
5658
dependencies: scipy_highspy_dep,
57-
c_args: [Wno_unused_variable, Wno_unused_but_set_variable],
58-
cpp_args: [_cpp_Wno_unused_variable, _cpp_Wno_unused_but_set_variable],
5959
link_args: version_link_args,
6060
gnu_symbol_visibility: 'hidden', # default
6161
install: true,
@@ -66,8 +66,6 @@ py3.extension_module(
6666
'_highs_options',
6767
sources: [highs_conf_file, 'highs_options.cpp'],
6868
dependencies: scipy_highspy_dep,
69-
c_args: [Wno_unused_variable, Wno_unused_but_set_variable],
70-
cpp_args: [_cpp_Wno_unused_variable, _cpp_Wno_unused_but_set_variable],
7169
link_args: version_link_args,
7270
gnu_symbol_visibility: 'hidden', # default
7371
install: true,

0 commit comments

Comments
 (0)