diff --git a/Doxyfile b/Doxyfile index 5962bf0..89e5255 100644 --- a/Doxyfile +++ b/Doxyfile @@ -48,7 +48,7 @@ PROJECT_NAME = fourdst::libcomposition # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = v2.4.6 +PROJECT_NUMBER = v2.4.7 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewers a diff --git a/build-config/fourdst/libconfig/meson.build b/build-config/fourdst/libconfig/meson.build index 563c5e1..a761bab 100644 --- a/build-config/fourdst/libconfig/meson.build +++ b/build-config/fourdst/libconfig/meson.build @@ -1,6 +1,7 @@ config_p = subproject('libconfig', default_options: [ 'pkg_config=' + get_option('pkg_config').to_string(), 'build_tests=' + get_option('build_tests').to_string(), - 'build_examples=' + get_option('build_examples').to_string() + 'build_examples=' + get_option('build_examples').to_string(), + 'build_python=' + get_option('build_python').to_string() ]) config_dep = config_p.get_variable('config_dep') diff --git a/build-config/fourdst/libconstants/meson.build b/build-config/fourdst/libconstants/meson.build index ccb1849..da8d356 100644 --- a/build-config/fourdst/libconstants/meson.build +++ b/build-config/fourdst/libconstants/meson.build @@ -3,7 +3,8 @@ const_p = subproject( default_options: [ 'pkg_config=' + get_option('pkg_config').to_string(), 'build_tests=' + get_option('build_tests').to_string(), - 'build_examples=' + get_option('build_examples').to_string() + 'build_examples=' + get_option('build_examples').to_string(), + 'build_python=' + get_option('build_python').to_string() ] ) const_dep = const_p.get_variable('const_dep') diff --git a/build-config/fourdst/liblogging/meson.build b/build-config/fourdst/liblogging/meson.build index 87b3553..709fe65 100644 --- a/build-config/fourdst/liblogging/meson.build +++ b/build-config/fourdst/liblogging/meson.build @@ -1,7 +1,8 @@ logging_p = subproject('liblogging', default_options: [ 'pkg_config=' + get_option('pkg_config').to_string(), 'build_tests=' + get_option('build_tests').to_string(), - 'build_examples=' + get_option('build_examples').to_string() + 'build_examples=' + get_option('build_examples').to_string(), + 'build_python=' + get_option('build_python').to_string() ]) logging_dep = logging_p.get_variable('logging_dep') diff --git a/meson.build b/meson.build index 55fd423..12a1bff 100644 --- a/meson.build +++ b/meson.build @@ -18,7 +18,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # *********************************************************************** # -project('libcomposition', 'cpp', version: 'v2.4.6', default_options: ['cpp_std=c++23'], meson_version: '>=1.5.0') +project('libcomposition', 'cpp', version: 'v2.4.7', default_options: ['cpp_std=c++23'], meson_version: '>=1.5.0') # Add default visibility for all C++ targets add_project_arguments('-fvisibility=default', language: 'cpp') diff --git a/subprojects/libconfig.wrap b/subprojects/libconfig.wrap index 90fd85d..021007d 100644 --- a/subprojects/libconfig.wrap +++ b/subprojects/libconfig.wrap @@ -1,6 +1,6 @@ [wrap-git] url = https://github.com/4D-STAR/libconfig.git -revision = v2.2.6 +revision = v2.2.9 depth = 1 [provide] diff --git a/subprojects/libconstants.wrap b/subprojects/libconstants.wrap index a0acb4e..ef37e0e 100644 --- a/subprojects/libconstants.wrap +++ b/subprojects/libconstants.wrap @@ -1,6 +1,6 @@ [wrap-git] url = https://github.com/4D-STAR/libconstants.git -revision = v1.1.2 +revision = v1.1.6 depth = 1 [provide] diff --git a/subprojects/liblogging.wrap b/subprojects/liblogging.wrap index 33a7d1f..e690257 100644 --- a/subprojects/liblogging.wrap +++ b/subprojects/liblogging.wrap @@ -1,6 +1,6 @@ [wrap-git] url = https://github.com/4D-STAR/liblogging.git -revision = v1.1.2 +revision = v1.1.6 depth = 1 [provide]