diff --git a/build-config/hypre/meson.build b/build-config/hypre/meson.build index 72951bf..9e24347 100644 --- a/build-config/hypre/meson.build +++ b/build-config/hypre/meson.build @@ -1,2 +1,9 @@ -hypre_sp = cmake.subproject('hypre') +hypre_cpp_cmake_options = cmake.subproject_options() +hypre_cpp_cmake_options.add_cmake_defines({ + 'BUILD_SHARED_LIBS': 'ON', +}) +hypre_sp = cmake.subproject( + 'hypre', + options: hypre_cpp_cmake_options, +) hypre_dep = hypre_sp.dependency('HYPRE') diff --git a/build-config/opatIO/meson.build b/build-config/opatIO/meson.build index 01ae467..4a69f2e 100644 --- a/build-config/opatIO/meson.build +++ b/build-config/opatIO/meson.build @@ -1,5 +1,10 @@ # Get the subproject object first -opat_sub = subproject('opat-core') +opat_sub = subproject( + 'opat-core', + default_options: { + 'generate_pc': false + } +) # Get the dependency variable from that subproject opatio_dep = opat_sub.get_variable('opatio_dep') \ No newline at end of file diff --git a/build-python/meson.build b/build-python/meson.build index 7141c6e..6d1e5c7 100644 --- a/build-python/meson.build +++ b/build-python/meson.build @@ -2,7 +2,7 @@ py_installation = import('python').find_installation('python3') py_mod = py_installation.extension_module( - 'fourdsse_bindings', # Name of the generated .so/.pyd file (without extension) + 'serif', # Name of the generated .so/.pyd file (without extension) sources: [ meson.project_source_root() + '/src/python/bindings.cpp', meson.project_source_root() + '/src/python/composition/bindings.cpp', @@ -18,5 +18,4 @@ py_mod = py_installation.extension_module( ], cpp_args : ['-UNDEBUG'], # Example: Ensure assertions are enabled if needed install : true, - subdir: 'fourdstar' # Optional: Install the module inside a 'fourdsse' Python package directory ) \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 1ebe206..e3f38b1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,8 +7,8 @@ requires = [ build-backend = "mesonpy" [project] -name = "fourdstar" # Choose your Python package name -version = "0.1.0" # Your project's version +name = "serif" # Choose your Python package name +version = "0.0.1a" # Your project's version description = "Python interface for the 4DSSE C++ project" readme = "Readme.md" license = { file = "LICENSE.txt" } # Reference your license file [cite: 2] diff --git a/src/polytrope/coeff/meson.build b/src/polytrope/coeff/meson.build index 4c82cff..4fc9f22 100644 --- a/src/polytrope/coeff/meson.build +++ b/src/polytrope/coeff/meson.build @@ -6,7 +6,7 @@ polyCoeff_headers = files( 'public/polyCoeff.h' ) -libPolyCoeff = static_library('polyCoeff', +libPolyCoeff = shared_library('polyCoeff', polyCoeff_sources, include_directories : include_directories('./public'), cpp_args: ['-fvisibility=default'], diff --git a/src/polytrope/solver/meson.build b/src/polytrope/solver/meson.build index f88a183..3b52c56 100644 --- a/src/polytrope/solver/meson.build +++ b/src/polytrope/solver/meson.build @@ -39,7 +39,7 @@ dependencies = [ types_dep, ] -libPolySolver = static_library('polySolver', +libPolySolver = shared_library('polySolver', polySolver_sources, include_directories : include_directories('./public'), cpp_args: ['-fvisibility=default'], diff --git a/src/polytrope/utils/meson.build b/src/polytrope/utils/meson.build index ec0c03c..1587b3a 100644 --- a/src/polytrope/utils/meson.build +++ b/src/polytrope/utils/meson.build @@ -34,7 +34,7 @@ dependencies = [ mfemanalysis_dep, ] -libpolyutils = library('polyutils', +libpolyutils = shared_library('polyutils', polyutils_sources, include_directories : include_directories('./public'), cpp_args: ['-fvisibility=default'], diff --git a/src/python/bindings.cpp b/src/python/bindings.cpp index 1eb5d01..1a19caf 100644 --- a/src/python/bindings.cpp +++ b/src/python/bindings.cpp @@ -6,8 +6,8 @@ #include "composition/bindings.h" #include "config/bindings.h" -PYBIND11_MODULE(fourdsse_bindings, m) { - m.doc() = "Python bindings for the 4DSSE project"; +PYBIND11_MODULE(serif, m) { + m.doc() = "Python bindings for the SERiF project"; auto compMod = m.def_submodule("composition", "Composition-module bindings"); register_comp_bindings(compMod); diff --git a/subprojects/opat-core.wrap b/subprojects/opat-core.wrap index bb78a4b..3db0c11 100644 --- a/subprojects/opat-core.wrap +++ b/subprojects/opat-core.wrap @@ -1,4 +1,4 @@ [wrap-git] url = https://github.com/4D-STAR/opat-core -revision = 0.3.1a +revision = 0.3.3a depth = 1