Skip to content

Commit 80c83e8

Browse files
committed
Update install location and tags
1 parent 7ca9af2 commit 80c83e8

File tree

6 files changed

+18
-6
lines changed

6 files changed

+18
-6
lines changed

examples/meson.build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ foreach example : onvm_examples
3838
sources,
3939
include_directories: includes,
4040
dependencies: [onvm_dpdk_shared_dep, onvm_nflib_dep],
41-
install_tag: name,
4241
install: true,
43-
install_dir: onvm_source + '/examples/' + example
42+
install_tag: 'onvm',
43+
install_dir: onvm_output_dir + '/nf/' + example
4444
)
4545
endforeach

meson.build

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ add_global_arguments('-msse4', language : 'c')
44
cc = meson.get_compiler('c')
55
onvm_source = meson.current_source_dir()
66

7+
# Output directory that executables are installed into
8+
onvm_output_dir = meson.current_source_dir() + '/bin'
9+
710
# ONVM configurations
811
onvm_mgr_app_name = 'onvm_mgr'
912

onvm/lib/meson.build

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ libonvmhelper = library(
66
'libonvmhelper',
77
sources,
88
include_directories : libonvmhelper_includes,
9-
install: true
9+
install: true,
10+
install_tag: 'onvm',
11+
install_dir: onvm_output_dir + '/lib'
1012
)
1113

1214
libonvmhelper_dep = declare_dependency(

onvm/onvm_mgr/meson.build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ executable(onvm_mgr_app_name,
1414
include_directories: [onvm_mgr_include, onvm_includes],
1515
dependencies: [onvm_dpdk_shared_dep, libonvm_dep, libonvmhelper_dep, onvm_math_dep],
1616
install: true,
17-
install_dir: onvm_source + '/onvm/onvm_mgr',
18-
install_tag: 'onvm_mgr'
17+
install_tag: 'onvm',
18+
install_dir: onvm_output_dir,
1919
)

onvm/onvm_nflib/meson.build

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ libonvm = library(
2222
sources,
2323
include_directories : libonvm_includes,
2424
dependencies : libonvm_deps,
25-
install: true)
25+
install: true,
26+
install_tag: 'onvm',
27+
install_dir: onvm_output_dir + '/lib')
2628

2729
libonvm_dep = declare_dependency(
2830
link_with: libonvm,

scripts/build.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
3+
meson build
4+
ninja -C build
5+
meson install -C build --tags=onvm

0 commit comments

Comments
 (0)