Skip to content
Snippets Groups Projects
Commit 0e67670b authored by Florian Schmaus's avatar Florian Schmaus
Browse files

Merge branch 'boost' into 'master'

Improve boost dependency and bump gitlab-ci docker image

See merge request i4/manycore/emper!116
parents b28a254f ff724a95
No related branches found
No related tags found
No related merge requests found
image: "flowdalic/debian-testing-dev:1.4" image: "flowdalic/debian-testing-dev:1.5"
before_script: before_script:
- | - |
......
...@@ -12,6 +12,8 @@ thread_dep = dependency('threads') ...@@ -12,6 +12,8 @@ thread_dep = dependency('threads')
uring_dep = dependency('liburing') uring_dep = dependency('liburing')
emper_dependencies = [thread_dep, uring_dep] emper_dependencies = [thread_dep, uring_dep]
boost_thread_dep = dependency('boost', modules : ['thread'], required: false)
run_target('iwyu', run_target('iwyu',
command: 'tools/check-iwyu') command: 'tools/check-iwyu')
...@@ -42,7 +44,9 @@ conf_data.set('EMPER_' + semaphore_impl.to_upper() + '_WAKEUP_SEMAPHORE', true) ...@@ -42,7 +44,9 @@ conf_data.set('EMPER_' + semaphore_impl.to_upper() + '_WAKEUP_SEMAPHORE', true)
locked_unbounded_queue_impl = get_option('locked_unbounded_queue_implementation') locked_unbounded_queue_impl = get_option('locked_unbounded_queue_implementation')
if locked_unbounded_queue_impl == 'boost_shared_mutex' if locked_unbounded_queue_impl == 'boost_shared_mutex'
boost_thread_dep = dependency('boost', modules : ['thread']) if not boost_thread_dep.found()
error('Boost thread module not found, but locked_unbounded_queue_implementation set to boost_shared_mutex')
endif
emper_dependencies += [boost_thread_dep] emper_dependencies += [boost_thread_dep]
endif endif
conf_data.set('EMPER_' + locked_unbounded_queue_impl.to_upper() + '_LOCKED_UNBOUNDED_QUEUE', true) conf_data.set('EMPER_' + locked_unbounded_queue_impl.to_upper() + '_LOCKED_UNBOUNDED_QUEUE', true)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment