diff --git a/meson.build b/meson.build index 3586de1..12375e4 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('fourdst', 'cpp', version: 'v0.10.4', default_options: ['cpp_std=c++23'], meson_version: '>=1.5.0') +project('fourdst', 'cpp', version: 'v0.10.5', default_options: ['cpp_std=c++23'], meson_version: '>=1.5.0') add_project_arguments('-fvisibility=default', language: 'cpp') diff --git a/pyproject.toml b/pyproject.toml index 497ed61..193a7dc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,6 +34,7 @@ fourdst-include-dirs = "fourdst:get_include_dirs" fourdst-lib-dirs = "fourdst:get_lib_dirs" fourdst-rpath-flags = "fourdst:get_rpath_flags" fourdst-version = "fourdst:print_fourdst_version" +fourdst-extra-flags = "fourdst:get_extra_flags" [tool.meson-python.args] setup = [ diff --git a/src-pybind/fourdst/__init__.py b/src-pybind/fourdst/__init__.py index b700d41..dabb830 100644 --- a/src-pybind/fourdst/__init__.py +++ b/src-pybind/fourdst/__init__.py @@ -54,8 +54,12 @@ def get_include_flags() -> List[str]: def get_compiler_flags() -> List[str]: return get_include_flags() + get_lib_flags() +def get_extra_flags() -> List[str]: + return ['-fPIC', '-std=c++23'] + def get_compiler_flags_formatted() -> int: flags = get_compiler_flags() + flags.extend(get_extra_flags()) print(' '.join(flags)) return 0 diff --git a/subprojects/libcomposition.wrap b/subprojects/libcomposition.wrap index b5ce668..7d320c3 100644 --- a/subprojects/libcomposition.wrap +++ b/subprojects/libcomposition.wrap @@ -1,4 +1,4 @@ [wrap-git] url = https://github.com/4D-STAR/libcomposition.git -revision = v2.4.8 +revision = v2.4.9 depth = 1