Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Further reduce boost dependencies #674

Merged
merged 3 commits into from
Jan 31, 2020
Merged

Further reduce boost dependencies #674

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c79577
Do not require dependencies when not needed.
lgbaldoni Jan 29, 2020
f4630cd
Merge remote-tracking branch 'upstream/develop' into develop
lgbaldoni Jan 31, 2020
4b64620
Reduce boost dependencies.
lgbaldoni Jan 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ project('tizonia', ['c', 'cpp'], version: '0.19.0', license: 'LGPLv3.0+', meson_
## * 3rdparty/dbus-cplusplus/src/meson.build sets -DDBUS_API_SUBJECT_TO_CHANGE
## unconditionally, on account of libtizdbus-c++.pc.in: shouldn't this
## reflect what is set in config.h or better yet, have it only in the latter?
## (kind of moot since no source file actually checks that macro)
## * see if all generated .pc files are actually necessary

host_os = host_machine.system()
Expand Down Expand Up @@ -88,17 +89,19 @@ rt_dep = cc.find_library('rt', required: true)
pthread_dep = dependency('threads', required: true)
uuid_dep = dependency('uuid', required: true, version: '>=2.19.0')

# perhaps fine tune this one for enable_player
# clients and cast do not actually require all of them, see if this can be optimised further
if enable_clients
boost_dep = dependency(
'boost', modules: ['chrono', 'filesystem', 'system', 'thread', 'program_options', 'python3'],
required: true, version: '>=1.54'
)
else
boost_dep = dependency(
'boost', modules: ['chrono', 'filesystem', 'system', 'thread', 'program_options'],
required: true, version: '>=1.54'
)
if enable_player
boost_dep = dependency(
'boost', modules: ['chrono', 'filesystem', 'system', 'thread', 'program_options'],
required: true, version: '>=1.54'
)
endif
endif

sqlite3_dep = dependency('sqlite3', required: true, version: '>=3.7.1')
Expand Down