@@ -21,12 +21,15 @@ highs_incdirs = highs_proj.get_variable('_incdirs')
21
21
highs_cpp_suppressions = highs_proj.get_variable (' _highs_cpp_suppressions' )
22
22
highs_c_suppressions = highs_proj.get_variable (' _highs_c_suppressions' )
23
23
24
+ highspy_cpp = highs_proj.get_variable (' highspy_cpp' )
25
+ highs_conf_file = highs_proj.get_variable (' highs_conf_file' )
26
+
24
27
_highslib = static_library (
25
28
' highs' ,
26
- highslib_srcs,
29
+ [highs_conf_file, highslib_srcs] ,
27
30
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 ,
30
33
include_directories : highs_incdirs,
31
34
# Ensure that if we link a static library into a shared library,
32
35
# private symbols don't get re-exported.
@@ -42,9 +45,6 @@ _highs_dep = declare_dependency(
42
45
include_directories : highs_incdirs,
43
46
)
44
47
45
- highspy_cpp = highs_proj.get_variable (' highspy_cpp' )
46
- highs_conf_file = highs_proj.get_variable (' highs_conf_file' )
47
-
48
48
scipy_highspy_dep = [py3_dep, pybind11_dep, _highs_dep, thread_dep, atomic_dep]
49
49
50
50
py3.install_sources(
@@ -54,7 +54,7 @@ py3.install_sources(
54
54
55
55
py3.extension_module(
56
56
' _core' ,
57
- sources : highspy_cpp + highs_conf_file,
57
+ sources : [ highspy_cpp, highs_conf_file] ,
58
58
dependencies : scipy_highspy_dep,
59
59
link_args : version_link_args,
60
60
gnu_symbol_visibility : ' hidden' , # default
0 commit comments