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

[build] Use emper_dep where sensible, introduce emper_full_dep

parent 56b22a1d
No related branches found
No related tags found
Loading
fib_exe = executable( fib_exe = executable(
'fib', 'fib',
'Main.cpp', 'Main.cpp',
include_directories: emper_all_include, dependencies: emper_dep,
link_with: [emper],
) )
worker_sleep_example_exe = executable( worker_sleep_example_exe = executable(
'worker_sleep_example', 'worker_sleep_example',
'WorkerSleepExample.cpp', 'WorkerSleepExample.cpp',
include_directories: emper_all_include, dependencies: emper_dep,
link_with: [emper],
) )
...@@ -71,3 +71,8 @@ emper_c_dep = declare_dependency( ...@@ -71,3 +71,8 @@ emper_c_dep = declare_dependency(
include_directories : emper_all_include, include_directories : emper_all_include,
link_with : emper_c link_with : emper_c
) )
emper_full_dep = [
emper_dep,
emper_c_dep,
]
...@@ -64,9 +64,9 @@ foreach source, test_dict : tests ...@@ -64,9 +64,9 @@ foreach source, test_dict : tests
# The test_name is the name of the source file without the file suffix. # The test_name is the name of the source file without the file suffix.
test_name = source.split('.')[0] test_name = source.split('.')[0]
test_dep = [thread_dep] test_deps = [thread_dep]
if test_dict.has_key('dependencies') if test_dict.has_key('dependencies')
test_dep += test_dict['dependencies'] test_deps += test_dict['dependencies']
endif endif
test_exe = executable(test_name, test_exe = executable(test_name,
...@@ -74,8 +74,7 @@ foreach source, test_dict : tests ...@@ -74,8 +74,7 @@ foreach source, test_dict : tests
include_directories: emper_all_include, include_directories: emper_all_include,
c_args: undef_ndebug, c_args: undef_ndebug,
cpp_args: undef_ndebug, cpp_args: undef_ndebug,
dependencies: emper_dependencies + test_dep, dependencies: [emper_full_dep] + test_deps,
link_with: [emper, emper_c],
) )
test(test_name, test(test_name,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment