diff --git a/releases.json b/releases.json index 56a4077a8..4bb242214 100644 --- a/releases.json +++ b/releases.json @@ -985,6 +985,7 @@ "fmt" ], "versions": [ + "11.2.0-2", "11.2.0-1", "11.1.4-1", "11.1.1-2", diff --git a/subprojects/packagefiles/fmt/meson.build b/subprojects/packagefiles/fmt/meson.build index 8f6c0e68f..c492315da 100644 --- a/subprojects/packagefiles/fmt/meson.build +++ b/subprojects/packagefiles/fmt/meson.build @@ -2,8 +2,8 @@ project( 'fmt', 'cpp', version: '11.2.0', + meson_version: '>=0.50.0', license: 'MIT WITH fmt-exception', - default_options: ['cpp_std=c++14'], ) fmt_private_cpp_args = [] @@ -15,40 +15,35 @@ endif header_only = get_option('header-only') -fmt_lib = library( - 'fmt', - 'src/format.cc', - 'src/os.cc', - cpp_args: fmt_private_cpp_args, - include_directories: 'include', - build_by_default: not header_only, - install: not header_only, -) - -if not header_only +if header_only + fmt_header_only_dep = declare_dependency( + include_directories: 'include', + compile_args: '-DFMT_HEADER_ONLY', + ) +else + fmt_lib = library( + 'fmt', + 'src/format.cc', + 'src/os.cc', + cpp_args: fmt_private_cpp_args, + override_options: 'cpp_std=c++14', + include_directories: 'include', + build_by_default: true, + install: true, + ) install_subdir( 'include', strip_directory: true, install_dir: get_option('includedir'), ) -endif - -fmt_dep = declare_dependency( - include_directories: 'include', - compile_args: fmt_interface_cpp_args, - link_with: fmt_lib, -) - -if meson.version().version_compare('>=0.54.0') - meson.override_dependency('fmt', fmt_dep) -endif - -fmt_header_only_dep = declare_dependency( - include_directories: 'include', - compile_args: '-DFMT_HEADER_ONLY', -) - -if not header_only + fmt_dep = declare_dependency( + include_directories: 'include', + compile_args: fmt_interface_cpp_args, + link_with: fmt_lib, + ) + if meson.version().version_compare('>=0.54.0') + meson.override_dependency('fmt', fmt_dep) + endif pkg_mod = import('pkgconfig') pkg_mod.generate( fmt_lib,