MAINT: Try static again, move meson files around

scipy · Oct 1, 2023 · 76c7af1 · 76c7af1
1 parent 8a99a9f
commit 76c7af1
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 27 deletions.
diff --git a/scipy/_lib/meson.build b/scipy/_lib/meson.build
@@ -150,30 +150,3 @@ py3.install_sources(
 
 subdir('_uarray')
 subdir('tests')
-
-# Setup the highs library
-highs_proj = subproject('highs',
-                      default_options : ['with_pybind11=True'])
-highs_dep = highs_proj.get_variable('highs_dep')
-highspy_py = highs_proj.get_variable('highspy_py')
-highspy_cpp = highs_proj.get_variable('highspy_cpp')
-
-pyb11_dep = [
-  py3.dependency(),
-  dependency('pybind11')
-]
-
-highspyext = py3.extension_module(
-  '_highs',
-  sources : highspy_cpp,
-  dependencies: [pyb11_dep, highs_dep],
-  c_args: [Wno_unused_variable, Wno_unused_but_set_variable],
-  cpp_args: [_cpp_Wno_unused_variable, _cpp_Wno_unused_but_set_variable],
-  install: true,
-  subdir: 'highspy',
-)
-
-py3.install_sources(
-  highspy_py,
-  subdir: 'highspy',
-)
diff --git a/scipy/optimize/_highs/meson.build b/scipy/optimize/_highs/meson.build
@@ -1,3 +1,43 @@
+# Setup the highs library
+highs_proj = subproject('highs',
+                      default_options : ['default_library=static',
+                                        'with_pybind11=True'])
+highs_dep = highs_proj.get_variable('highs_dep')
+highspy_py = highs_proj.get_variable('highspy_py')
+highspy_cpp = highs_proj.get_variable('highspy_cpp')
+highsoptions_cpp = highs_proj.get_variable('highsoptions_cpp')
+
+pyb11_dep = [
+  py3.dependency(),
+  dependency('pybind11')
+]
+
+py3.extension_module(
+  '_highs',
+  sources : highspy_cpp,
+  dependencies: [pyb11_dep, highs_dep],
+  c_args: [Wno_unused_variable, Wno_unused_but_set_variable],
+  cpp_args: [_cpp_Wno_unused_variable, _cpp_Wno_unused_but_set_variable],
+  subdir: 'highspy',
+  install: true,
+)
+
+
+py3.extension_module(
+  '_highs_options',
+  sources : highsoptions_cpp,
+  dependencies: [pyb11_dep, highs_dep],
+  c_args: [Wno_unused_variable, Wno_unused_but_set_variable],
+  cpp_args: [_cpp_Wno_unused_variable, _cpp_Wno_unused_but_set_variable],
+  subdir: 'highspy',
+  install: true,
+)
+
+py3.install_sources(
+  highspy_py,
+  subdir: 'highspy',
+)
+
 py3.install_sources([
   '__init__.py',
   '_highs_wrapper.py',

diff --git a/scipy/optimize/_highs/src/HConfig.h b/scipy/optimize/_highs/src/HConfig.h