Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions drivers/linux-gv/Kbuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ccflags-y := $(MODULE_CFLAGS)
obj-m := aravis_gv.o
aravis_gv-y := $(patsubst $(src)/%.c,%.o,$(wildcard $(src)/*.c))
File renamed without changes.
13 changes: 13 additions & 0 deletions drivers/linux-gv/meson.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
gv_mkfile = custom_target('gv_makefile', output:'Makefile', command:['touch', '@OUTPUT@'])

gv_sources = files([
'arvgvkmod.c'
])

custom_target ('gv_kmod',input: gv_sources, output: 'aravis_gv.ko', command:[
'make', '-j4', '-C', kernel_build_dir,
'M='+join_paths(meson.current_build_dir()),
'src='+join_paths(meson.current_source_dir()),
'MODULE_CFLAGS=-I'+meson.current_source_dir(),
'modules'], depends:gv_mkfile, build_by_default:true)

12 changes: 12 additions & 0 deletions drivers/meson.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
if host_machine.system()=='linux'
kernel_version = run_command('uname', '-r').stdout().strip()
kernel_build_dir = join_paths('/', 'lib', 'modules', kernel_version, 'build')

# test running make in kernel directory, using "make kernelversion"
make_returncode = run_command('make', '-sC', kernel_build_dir, 'kernelversion').returncode()
if make_returncode != 0
error('Cannot compile kernel modules as requested - are kernel headers installed?')
endif

subdir('linux-gv')
endif
4 changes: 4 additions & 0 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,10 @@ viewer_deps = aravis_dependencies + [dependency ('gtk+-3.0', version: '>=3.12',
subdir ('po', if_found: viewer_deps)
subdir ('viewer', if_found: viewer_deps)

if get_option('drivers')
subdir('drivers')
endif

gst_enabled = false
gst_option = get_option ('gst-plugin')
gst_deps = aravis_dependencies + [dependency ('gstreamer-base-1.0', required: gst_option),
Expand Down
1 change: 1 addition & 0 deletions meson_options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ option('fast-heartbeat', type: 'boolean', value: false, description: 'Enable fas
option('gentl-producer', type: 'boolean', value: false, description : 'Enable experimental GenTL producer')
option('event', type: 'boolean', value: false, description: 'Enable experimental event support')
option('v4l2', type: 'feature', value: 'disabled', description : 'Enable experimental V4L2 support')
option('drivers', type: 'boolean', value: false, description: 'Build linux driver')

# Parameters

Expand Down
73 changes: 0 additions & 73 deletions module/Makefile

This file was deleted.

Empty file removed module/aravis-module.h
Empty file.
Loading