build: fix dirmonitor backend selection (#1790)
When a backend was specified using meson, the relative source files weren't being added.
This commit is contained in:
+17
-8
@@ -11,6 +11,7 @@ lite_sources = [
|
|||||||
'main.c',
|
'main.c',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
lite_sources += 'api/dirmonitor.c'
|
||||||
# dirmonitor backend
|
# dirmonitor backend
|
||||||
if get_option('dirmonitor_backend') == ''
|
if get_option('dirmonitor_backend') == ''
|
||||||
if cc.has_function('inotify_init', prefix : '#include<sys/inotify.h>')
|
if cc.has_function('inotify_init', prefix : '#include<sys/inotify.h>')
|
||||||
@@ -19,6 +20,8 @@ if get_option('dirmonitor_backend') == ''
|
|||||||
dirmonitor_backend = 'fsevents'
|
dirmonitor_backend = 'fsevents'
|
||||||
elif cc.has_function('kqueue', prefix : '#include<sys/event.h>')
|
elif cc.has_function('kqueue', prefix : '#include<sys/event.h>')
|
||||||
dirmonitor_backend = 'kqueue'
|
dirmonitor_backend = 'kqueue'
|
||||||
|
elif cc.has_function('create_inode_watcher', prefix : '#include<fcntl.h>')
|
||||||
|
dirmonitor_backend = 'inodewatcher'
|
||||||
elif dependency('libkqueue', required : false).found()
|
elif dependency('libkqueue', required : false).found()
|
||||||
dirmonitor_backend = 'kqueue'
|
dirmonitor_backend = 'kqueue'
|
||||||
elif host_machine.system() == 'windows'
|
elif host_machine.system() == 'windows'
|
||||||
@@ -31,20 +34,26 @@ else
|
|||||||
dirmonitor_backend = get_option('dirmonitor_backend')
|
dirmonitor_backend = get_option('dirmonitor_backend')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
message('dirmonitor_backend: @0@'.format(dirmonitor_backend))
|
if dirmonitor_backend == 'inotify'
|
||||||
|
lite_sources += 'api/dirmonitor/inotify.c'
|
||||||
if dirmonitor_backend == 'kqueue'
|
elif dirmonitor_backend == 'fsevents'
|
||||||
|
lite_sources += 'api/dirmonitor/fsevents.c'
|
||||||
|
elif dirmonitor_backend == 'kqueue'
|
||||||
|
lite_sources += 'api/dirmonitor/kqueue.c'
|
||||||
libkqueue_dep = dependency('libkqueue', required : false)
|
libkqueue_dep = dependency('libkqueue', required : false)
|
||||||
if libkqueue_dep.found()
|
if libkqueue_dep.found()
|
||||||
lite_deps += libkqueue_dep
|
lite_deps += libkqueue_dep
|
||||||
endif
|
endif
|
||||||
|
elif dirmonitor_backend == 'inodewatcher'
|
||||||
|
add_languages('cpp')
|
||||||
|
lite_sources += 'api/dirmonitor/inodewatcher.cpp'
|
||||||
|
elif dirmonitor_backend == 'win32'
|
||||||
|
lite_sources += 'api/dirmonitor/win32.c'
|
||||||
|
else
|
||||||
|
lite_sources += 'api/dirmonitor/dummy.c'
|
||||||
endif
|
endif
|
||||||
|
|
||||||
lite_sources += [
|
message('dirmonitor_backend: @0@'.format(dirmonitor_backend))
|
||||||
'api/dirmonitor.c',
|
|
||||||
'api/dirmonitor/' + dirmonitor_backend + '.c',
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
lite_rc = []
|
lite_rc = []
|
||||||
if host_machine.system() == 'windows'
|
if host_machine.system() == 'windows'
|
||||||
|
|||||||
Reference in New Issue
Block a user