Incorporate @neheb's feedback

mesonbuild · Dec 14, 2023 · 4cc1f5b · 4cc1f5b
1 parent 505c47f
commit 4cc1f5b
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/subprojects/packagefiles/spdlog/meson.build b/subprojects/packagefiles/spdlog/meson.build
@@ -15,20 +15,16 @@ thread_dep = dependency('threads')
 spdlog_dependencies = [thread_dep]
 spdlog_compile_args = []
 
-if get_option('external_fmt').enabled()
-  fmt_dep = dependency('fmt', version: '>=8.1', required: true)
+if meson.get_compiler('cpp').has_header_symbol('format', '__cpp_lib_format', required: get_option('std_format'))
+  spdlog_compile_args += '-DSPDLOG_USE_STD_FORMAT'
+else
+  fmt_dep = dependency('fmt', version: '>=8.1', required: get_option('external_fmt').enabled())
   if fmt_dep.found()
     spdlog_dependencies += fmt_dep
     spdlog_compile_args += '-DSPDLOG_FMT_EXTERNAL'
   endif
 endif
 
-if get_option('std_format').enabled()
-  if meson.get_compiler('cpp').has_header_symbol('format', '__cpp_lib_format', required: true)
-    spdlog_compile_args += '-DSPDLOG_USE_STD_FORMAT'
-  endif
-endif
-
 if get_option('compile_library')
   spdlog_compile_args += '-DSPDLOG_COMPILED_LIB'
   if get_option('default_library') != 'static'