merge with v1.x
This commit is contained in:
		@@ -23,7 +23,7 @@ if get_option('external_fmt')
 | 
			
		||||
    if not meson.version().version_compare('>=0.49.0')
 | 
			
		||||
    warning('Finding fmt can fail with meson versions before 0.49.0')
 | 
			
		||||
    endif
 | 
			
		||||
    dep_list     += dependency('fmt')
 | 
			
		||||
    dep_list     += dependency('fmt', fallback :  ['fmt', 'fmt_dep'])
 | 
			
		||||
    compile_args += '-DSPDLOG_FMT_EXTERNAL'
 | 
			
		||||
endif
 | 
			
		||||
 | 
			
		||||
@@ -149,7 +149,7 @@ endif
 | 
			
		||||
# ---   Conditionally add subdirs   ---
 | 
			
		||||
# -------------------------------------
 | 
			
		||||
 | 
			
		||||
if get_option('enable_tests') or get_option('enable_tests-ho')
 | 
			
		||||
if get_option('enable_tests') or get_option('enable_tests_ho')
 | 
			
		||||
    subdir('tests')
 | 
			
		||||
endif
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user