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

Merge branch 'meson_subproject' into 'master'

make emper consumable as meson subproject

See merge request i4/manycore/emper!1
parents 62900cd1 41289e33
No related branches found
No related tags found
No related merge requests found
...@@ -3,6 +3,6 @@ emper_include = include_directories('.') ...@@ -3,6 +3,6 @@ emper_include = include_directories('.')
emper_version_h = custom_target( emper_version_h = custom_target(
'emper-version.h', 'emper-version.h',
output: 'emper-version.h', output: 'emper-version.h',
command: ['@SOURCE_DIR@/scripts/versionManager.sh', 'check', meson.project_version()] command: ['@CURRENT_SOURCE_DIR@/../../scripts/versionManager.sh', 'check', meson.project_version()]
) )
emper_generated_files += emper_version_h emper_generated_files += emper_version_h
...@@ -45,6 +45,11 @@ emper = library( ...@@ -45,6 +45,11 @@ emper = library(
install: true, install: true,
) )
emper_dep = declare_dependency(
include_directories : emper_all_include,
link_with : emper
)
emper_c_sources = [ emper_c_sources = [
'c_emper.cpp', 'c_emper.cpp',
...@@ -57,3 +62,8 @@ emper_c = library( ...@@ -57,3 +62,8 @@ emper_c = library(
link_with: emper, link_with: emper,
install: true, install: true,
) )
emper_c_dep = declare_dependency(
include_directories : emper_all_include,
link_with : emper_c
)
...@@ -9,7 +9,7 @@ project('EMPER', 'c', 'cpp', ...@@ -9,7 +9,7 @@ project('EMPER', 'c', 'cpp',
]) ])
# TODO: Re-enable that warning. # TODO: Re-enable that warning.
add_global_arguments('-Wno-non-virtual-dtor', language: 'cpp') add_project_arguments('-Wno-non-virtual-dtor', language: 'cpp')
thread_dep = dependency('threads') thread_dep = dependency('threads')
emper_dependencies = [thread_dep] emper_dependencies = [thread_dep]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment