getting closer using subdir

underworldcode · Nov 21, 2023 · 91d9ecb · 91d9ecb
1 parent 02cd8fa
commit 91d9ecb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/meson.build b/meson.build
@@ -1,5 +1,7 @@
 project('stripy', 'c')
 
+name = 'stripy'
+
 add_languages('fortran')
 
 py_mod = import('python')
@@ -18,6 +20,8 @@ incdir_f2py = run_command(py,
 
 inc_np = include_directories(incdir_numpy, incdir_f2py)
 
+install_subdir(name, install_dir: py.get_install_dir() / name, strip_directory: true)
+
 tripack_source = custom_target('_tripackmodule.c',
   input : ['src/tripack.pyf', 'src/tripack.f90'],  # .f so no F90 wrappers
   output : ['_tripackmodule.c', '_tripack-f2pywrappers.f', '_tripack-f2pywrappers2.f90'],
@@ -52,6 +56,7 @@ fortran_source = custom_target('_fortranmodule.c',
 py.extension_module('_tripack',
   ['src/tripack.f90', tripack_source],
   incdir_f2py / 'fortranobject.c',
+  subdir: 'stripy',
   include_directories: inc_np,
   dependencies: py_dep,
   install: true,
@@ -60,6 +65,7 @@ py.extension_module('_tripack',
 py.extension_module('_stripack',
   ['src/stripack.f90', stripack_source],
   incdir_f2py / 'fortranobject.c',
+  subdir: 'stripy',
   include_directories: inc_np,
   dependencies: py_dep,
   install: true,
@@ -68,6 +74,7 @@ py.extension_module('_stripack',
 py.extension_module('_srfpack',
   ['src/srfpack.f', srfpack_source],
   incdir_f2py / 'fortranobject.c',
+  subdir: 'stripy',
   include_directories: inc_np,
   dependencies: py_dep,
   install: true,
@@ -76,6 +83,7 @@ py.extension_module('_srfpack',
 py.extension_module('_ssrfpack',
   ['src/ssrfpack.f', ssrfpack_source],
   incdir_f2py / 'fortranobject.c',
+  subdir: 'stripy',
   include_directories: inc_np,
   dependencies: py_dep,
   install: true,
@@ -84,6 +92,7 @@ py.extension_module('_ssrfpack',
 py.extension_module('_fortran',
   ['src/stripyf.f90', fortran_source],
   incdir_f2py / 'fortranobject.c',
+  subdir: 'stripy',
   include_directories: inc_np,
   dependencies: py_dep,
   install: true,

diff --git a/stripy/cartesian.py b/stripy/cartesian.py
@@ -20,8 +20,8 @@
 # -*- coding: utf-8 -*-
 from multiprocessing import cpu_count
 
-import _tripack
-import _srfpack
+from . import _tripack
+from . import _srfpack
 import numpy as np
 
 try: range = xrange

diff --git a/stripy/spherical.py b/stripy/spherical.py
@@ -20,8 +20,8 @@
 # -*- coding: utf-8 -*-
 from multiprocessing import cpu_count
 
-import _stripack
-import _ssrfpack
+from . import _stripack
+from . import _ssrfpack
 import numpy as np
 
 try: range = xrange