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

Merge pull request #1161 from mensinda/mesonSubInstall 

meson: Do not install when used as a subproject
This commit is contained in:
Gabi Melman 2019-07-20 08:30:22 -04:00 committed by GitHub
parent a7ba6e447d 313ec87dc1
commit 20a1d1c519
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
meson.build
View File

@ -4,7 +4,6 @@ project('spdlog', ['cpp'],
default_options : [ default_options : [
'warning_level=3', 'warning_level=3',
'cpp_std=c++11', 'cpp_std=c++11',
'default_library=static',
'buildtype=release', 'buildtype=release',
'b_colorout=always', 'b_colorout=always',
], ],
@ -34,12 +33,21 @@ endif
spdlog_inc = include_directories('./include') spdlog_inc = include_directories('./include')
spdlog = library('spdlog', ['src/spdlog.cpp'], if get_option('library_type') == 'static'
cpp_args : [compile_args] + ['-DSPDLOG_COMPILED_LIB'], spdlog = static_library('spdlog', ['src/spdlog.cpp'],
include_directories : spdlog_inc, cpp_args : [compile_args] + ['-DSPDLOG_COMPILED_LIB'],
dependencies : dep_list, include_directories : spdlog_inc,
install : true, dependencies : dep_list,
) install : not meson.is_subproject(),
)
else
spdlog = shared_library('spdlog', ['src/spdlog.cpp'],
cpp_args : [compile_args] + ['-DSPDLOG_COMPILED_LIB'],
include_directories : spdlog_inc,
dependencies : dep_list,
install : not meson.is_subproject(),
)
endif
spdlog_dep = declare_dependency( spdlog_dep = declare_dependency(
link_with : spdlog, link_with : spdlog,
@ -64,15 +72,18 @@ spdlog_headeronly_dep = declare_dependency(
# --- Installation --- # --- Installation ---
# ------------------------ # ------------------------
install_subdir('include/spdlog', install_dir: get_option('includedir')) # Do not install when spdlog is used as a subproject
if not meson.is_subproject()
install_subdir('include/spdlog', install_dir: get_option('includedir'))
pkg = import('pkgconfig') pkg = import('pkgconfig')
pkg.generate(spdlog, pkg.generate(spdlog,
name : 'spdlog', name : 'spdlog',
description : 'Fast C++ logging library', description : 'Fast C++ logging library',
url : 'https://github.com/gabime/spdlog', url : 'https://github.com/gabime/spdlog',
extra_cflags : ['-DSPDLOG_COMPILED_LIB'] extra_cflags : ['-DSPDLOG_COMPILED_LIB']
) )
endif
# ------------------------------------- # -------------------------------------
# --- Conditionally add subdirs --- # --- Conditionally add subdirs ---
@ -100,11 +111,13 @@ summary_str = '''spdlog build summary:
- building tests: @1@ - building tests: @1@
- building examples: @2@ - building examples: @2@
- building benchmarks: @3@ - building benchmarks: @3@
- library type: @4@
'''.format( '''.format(
get_option('external_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'),
get_option('library_type')
) )
message(summary_str) message(summary_str)

1
meson_options.txt
View File

@ -2,3 +2,4 @@ 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)
option('library_type', type: 'combo', choices: ['static', 'shared'], value: 'static')