Skip to content

Commit

Permalink
Update install location and tags
Browse files Browse the repository at this point in the history
  • Loading branch information
marascoben committed Aug 27, 2024
1 parent 7ca9af2 commit 80c83e8
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 6 deletions.
4 changes: 2 additions & 2 deletions examples/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ foreach example : onvm_examples
sources,
include_directories: includes,
dependencies: [onvm_dpdk_shared_dep, onvm_nflib_dep],
install_tag: name,
install: true,
install_dir: onvm_source + '/examples/' + example
install_tag: 'onvm',
install_dir: onvm_output_dir + '/nf/' + example
)
endforeach
3 changes: 3 additions & 0 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ add_global_arguments('-msse4', language : 'c')
cc = meson.get_compiler('c')
onvm_source = meson.current_source_dir()

# Output directory that executables are installed into
onvm_output_dir = meson.current_source_dir() + '/bin'

# ONVM configurations
onvm_mgr_app_name = 'onvm_mgr'

Expand Down
4 changes: 3 additions & 1 deletion onvm/lib/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ libonvmhelper = library(
'libonvmhelper',
sources,
include_directories : libonvmhelper_includes,
install: true
install: true,
install_tag: 'onvm',
install_dir: onvm_output_dir + '/lib'
)

libonvmhelper_dep = declare_dependency(
Expand Down
4 changes: 2 additions & 2 deletions onvm/onvm_mgr/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ executable(onvm_mgr_app_name,
include_directories: [onvm_mgr_include, onvm_includes],
dependencies: [onvm_dpdk_shared_dep, libonvm_dep, libonvmhelper_dep, onvm_math_dep],
install: true,
install_dir: onvm_source + '/onvm/onvm_mgr',
install_tag: 'onvm_mgr'
install_tag: 'onvm',
install_dir: onvm_output_dir,
)
4 changes: 3 additions & 1 deletion onvm/onvm_nflib/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ libonvm = library(
sources,
include_directories : libonvm_includes,
dependencies : libonvm_deps,
install: true)
install: true,
install_tag: 'onvm',
install_dir: onvm_output_dir + '/lib')

libonvm_dep = declare_dependency(
link_with: libonvm,
Expand Down
5 changes: 5 additions & 0 deletions scripts/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/bash

meson build
ninja -C build
meson install -C build --tags=onvm

0 comments on commit 80c83e8

Please sign in to comment.