TMP: Stop building _highs_options

ERGO-Code · May 19, 2024 · b6db26c · b6db26c
1 parent 76533fd
commit b6db26c
Showing 1 changed file with 16 additions and 34 deletions.
diff --git a/src/meson.build b/src/meson.build
@@ -302,7 +302,6 @@ if get_option('default_library') == 'static'
 endif
 
 
-if not get_option('with_pybind11')
 highslib = library('highs',
                    highslib_srcs,
                    dependencies: _deps,
@@ -317,7 +316,6 @@ highs_dep = declare_dependency(link_with: highslib,
                                dependencies: _deps,
                                include_directories: _incdirs,
                                )
-endif
 
 # --------------- Interfaces
 
@@ -356,24 +354,6 @@ endif
 
 if get_option('with_pybind11')
   py = import('python').find_installation(pure: false)
-
-  highslib = library('highs',
-                     highslib_srcs,
-                     dependencies: _deps,
-                     cpp_args: _args,
-                     c_args: _args,
-                     include_directories: _incdirs,
-                     gnu_symbol_visibility: symbol_visibility,
-                     pic: true,
-                     install: true,
-                     install_dir: py.get_install_dir() / 'highspy')
-
-highs_dep = declare_dependency(link_with: highslib,
-                                   dependencies: _deps,
-                                   include_directories: _incdirs,
-                               )
-  _deps += highs_dep
-
   pyb11_dep = [
     # py_dep is auto-added for Python >= 3.9, so it can be dropped here when
     # that is the minimum supported Python version
@@ -392,22 +372,24 @@ highs_dep = declare_dependency(link_with: highslib,
   py.extension_module(
     '_core',
     sources : highspy_cpp + highs_conf_file,
-    dependencies: _deps,
+    dependencies: pyb11_dep,
     cpp_args: _args,
     install: true,
     subdir: 'highspy',
+    link_with: highslib,
     include_directories: _incdirs,
   )
 
-  py.extension_module(
-    '_highs_options',
-    sources : highsoptions_cpp + highs_conf_file,
-    dependencies: _deps,
-    cpp_args: _args,
-    install: true,
-    subdir: 'highspy',
-    include_directories: _incdirs,
-  )
+  # py.extension_module(
+  #   '_highs_options',
+  #   sources : highsoptions_cpp + highs_conf_file + 'lp_data/HighsOptions.cpp',
+  #   dependencies: pyb11_dep,
+  #   cpp_args: _args,
+  #   install: true,
+  #   subdir: 'highspy',
+  #   link_with: highslib,
+  #   include_directories: _incdirs,
+  # )
 
   py.install_sources([
       'highspy/__init__.py',
@@ -417,9 +399,9 @@ highs_dep = declare_dependency(link_with: highslib,
     subdir: 'highspy'
   )
 
-if is_windows
-  rootdir = meson.source_root()
-  meson.add_install_script(f'@rootdir@' / 'scripts' / 'post_install_win.bat', '{dest_dir}', '{wheel}')
-endif
+# if is_windows
+#   rootdir = meson.source_root()
+#   meson.add_install_script(f'@rootdir@' / 'scripts' / 'post_install_win.bat', '{dest_dir}', '{wheel}')
+# endif
 
 endif