TeaSpeak
/
spdlog
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'v1.x' of https://github.com/gabime/spdlog into v1.x

This commit is contained in:
gabime 2019-07-17 14:02:27 +03:00
parent 39910f5137 6fc4eb92db
commit a7c06eadd0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meson.build
View File

@ -20,7 +20,7 @@ compile_args = []
dep_list += dependency('threads') dep_list += dependency('threads')
# Check for FMT # Check for FMT
if get_option('extrenal_fmt') if get_option('external_fmt')
if not meson.version().version_compare('>=0.49.0') if not meson.version().version_compare('>=0.49.0')
warning('Finding fmt can fail wit meson versions before 0.49.0') warning('Finding fmt can fail wit meson versions before 0.49.0')
endif endif
@ -96,12 +96,12 @@ endif
summary_str = '''spdlog build summary: summary_str = '''spdlog build summary:
- using extrenal fmt: @0@ - using external fmt: @0@
- building tests: @1@ - building tests: @1@
- building examples: @2@ - building examples: @2@
- building benchmarks: @3@ - building benchmarks: @3@
'''.format( '''.format(
get_option('extrenal_fmt'), get_option('external_fmt'),
get_option('enable_tests'), get_option('enable_tests'),
get_option('enable_examples'), get_option('enable_examples'),
get_option('enable_benchmarks') get_option('enable_benchmarks')

2
meson_options.txt
View File

@ -1,4 +1,4 @@
option('extrenal_fmt', type: 'boolean', value: false) option('external_fmt', type: 'boolean', value: false)
option('enable_examples', type: 'boolean', value: false) option('enable_examples', type: 'boolean', value: false)
option('enable_benchmarks', type: 'boolean', value: false) option('enable_benchmarks', type: 'boolean', value: false)
option('enable_tests', type: 'boolean', value: false) option('enable_tests', type: 'boolean', value: false)