build(libconfig): fixed issues with libconfig installing in python wheel

This commit is contained in:
2025-12-20 14:49:27 -05:00
parent 47341c9845
commit 63caa78f15
5 changed files with 18 additions and 10 deletions

View File

@@ -1,4 +1,4 @@
project('fourdst', 'cpp', version: 'v0.9.17', default_options: ['cpp_std=c++23'], meson_version: '>=1.5.0')
project('fourdst', 'cpp', version: 'v0.9.18', default_options: ['cpp_std=c++23'], meson_version: '>=1.5.0')
add_project_arguments('-fvisibility=default', language: 'cpp')

View File

@@ -2,7 +2,7 @@ option('pkg_config', type: 'boolean', value: false, description: 'generate pkg-c
option('electron_build_py_backend', type: 'boolean', value: false, description: 'use pyinstaller to build the python backend for the electron app')
option('build_tests', type: 'boolean', value: false, description: 'compile subproject tests')
option('build_lib_all', type: 'boolean', value: true, description: 'build the full fourdst library with all features enabled')
option('build_lib_comp', type: 'boolean', value: false, description: 'build the minimal fourdst library with only compression and decompression features enabled')
option('build_lib_comp', type: 'boolean', value: false, description: 'build the fourdst libcomposition library')
option('build_lib_config', type: 'boolean', value: false, description: 'build the fourdst library configuration tool only')
option('build_lib_const', type: 'boolean', value: false, description: 'build the fourdst library constants only')
option('build_python', type: 'boolean', value: true, description: 'build the python bindings so you can use fourdst from python. This will also build libcomposition, libconfig, and libconstants')

View File

@@ -34,3 +34,18 @@ dependencies = [
[project.scripts]
fourdst-cli = "fourdst.cli.main:app"
[tool.meson-python.args]
setup = [
'-Dpkg_config=false',
'-Dbuild_python=true',
'-Delectron_build_py_backend=false',
'-Dbuild_tests=false',
'-Dbuild_lib_all=false',
'-Dbuild_lib_comp=true',
'-Dbuild_lib_config=true',
'-Dbuild_lib_const=true',
'-Dbuild_lib_log=true',
'-Dbuild_lib_plugin=false'
]

View File

@@ -277,13 +277,6 @@ void register_comp_bindings(pybind11::module &m) {
&fourdst::composition::utils::CompositionHash::hash_exact<fourdst::composition::Composition>,
py::arg("composition"),
"Compute a hash for a given Composition object."
)
.def_static(
"hash_quantized",
&fourdst::composition::utils::CompositionHash::hash_quantized<fourdst::composition::Composition>,
py::arg("composition"),
py::arg("eps"),
"Compute a quantized hash for a given Composition object with specified precision."
);
utils.def(

View File

@@ -1,4 +1,4 @@
[wrap-git]
url = https://github.com/4D-STAR/libconfig.git
revision = v2.0.2
revision = v2.0.3
depth = 1