Skip to content
Snippets Groups Projects
Commit 2d0b5f6b authored by Florian Fischer's avatar Florian Fischer
Browse files

[meson] better propagate dependencies

The emper header LockedUnboundedQueue.hpp could depend on different libraries
according to the implementation.

To link those dependencies with everything including LockedUnboundedQueue.hpp
we propagate all emper_dependencies through emper_dep.

And using emper_dep as a dependency seems anyway better than essentially
writing down emper_dep manually each time.

emper_dep essentially is:
(link_with:emper, include_directories: emper_all_include)
parent b22579c0
No related branches found
No related tags found
No related merge requests found
...@@ -54,7 +54,8 @@ emper = library( ...@@ -54,7 +54,8 @@ emper = library(
emper_dep = declare_dependency( emper_dep = declare_dependency(
include_directories : emper_all_include, include_directories : emper_all_include,
link_with : emper link_with : emper,
dependencies : emper_dependencies,
) )
...@@ -65,8 +66,7 @@ emper_c_sources = [ ...@@ -65,8 +66,7 @@ emper_c_sources = [
emper_c = library( emper_c = library(
'emper-c', 'emper-c',
emper_c_sources, emper_c_sources,
include_directories: emper_all_include, dependencies: emper_dep,
link_with: emper,
install: true, install: true,
) )
......
executable( executable(
'time_to_spawn', 'time_to_spawn',
'TimeToSpawn.cpp', 'TimeToSpawn.cpp',
include_directories: emper_all_include, dependencies: emper_dep,
dependencies: thread_dep,
link_with: emper,
) )
executable( executable(
'spawn_a_lot', 'spawn_a_lot',
'SpawnALot.cpp', 'SpawnALot.cpp',
include_directories: emper_all_include, dependencies: emper_dep,
dependencies: thread_dep,
link_with: emper,
) )
executable( executable(
'locality', 'locality',
'Locality.cpp', 'Locality.cpp',
include_directories: emper_all_include, dependencies: emper_dep,
link_with: emper,
) )
...@@ -5,8 +5,7 @@ test_fixtures_sources = ['network.cpp'] ...@@ -5,8 +5,7 @@ test_fixtures_sources = ['network.cpp']
test_fixtures_lib = library( test_fixtures_lib = library(
'test-fixtures', 'test-fixtures',
test_fixtures_sources, test_fixtures_sources,
include_directories: emper_all_include, dependencies: emper_dep,
link_with: emper,
) )
test_fixtures = declare_dependency( test_fixtures = declare_dependency(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment