Skip to content

Commit 01f615a

Browse files
committed
BLD: Use all highs arguments
1 parent e2d896a commit 01f615a

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

scipy/optimize/_highspy/meson.build

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,15 @@ highs_incdirs = highs_proj.get_variable('_incdirs')
2121
highs_cpp_suppressions = highs_proj.get_variable('_highs_cpp_suppressions')
2222
highs_c_suppressions = highs_proj.get_variable('_highs_c_suppressions')
2323

24+
highspy_cpp = highs_proj.get_variable('highspy_cpp')
25+
highs_conf_file = highs_proj.get_variable('highs_conf_file')
26+
2427
_highslib = static_library(
2528
'highs',
26-
highslib_srcs,
29+
[highs_conf_file, highslib_srcs],
2730
dependencies: highs_deps,
28-
cpp_args: highs_cpp_suppressions,
29-
c_args: highs_c_suppressions,
31+
cpp_args: highs_cpp_suppressions + highs_args,
32+
c_args: highs_c_suppressions + highs_args,
3033
include_directories: highs_incdirs,
3134
# Ensure that if we link a static library into a shared library,
3235
# private symbols don't get re-exported.
@@ -42,9 +45,6 @@ _highs_dep = declare_dependency(
4245
include_directories: highs_incdirs,
4346
)
4447

45-
highspy_cpp = highs_proj.get_variable('highspy_cpp')
46-
highs_conf_file = highs_proj.get_variable('highs_conf_file')
47-
4848
scipy_highspy_dep = [py3_dep, pybind11_dep, _highs_dep, thread_dep, atomic_dep]
4949

5050
py3.install_sources(
@@ -54,7 +54,7 @@ py3.install_sources(
5454

5555
py3.extension_module(
5656
'_core',
57-
sources: highspy_cpp + highs_conf_file,
57+
sources: [highspy_cpp, highs_conf_file],
5858
dependencies: scipy_highspy_dep,
5959
link_args: version_link_args,
6060
gnu_symbol_visibility: 'hidden', # default

0 commit comments

Comments
 (0)