X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=meson.build;h=d6d0e99b55fbe4127c82e38dda78e81bc2b35fc8;hb=d5ba26d705460a7e37213eeb4954b2efed8bebf0;hp=1535d181c9b9bd88a3f7f21850011bbafbc78a12;hpb=d611c315787ed77e2bc4e5d6b74e3cd58a489612;p=plocate

diff --git a/meson.build b/meson.build
index 1535d18..d6d0e99 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('plocate', 'cpp', default_options: ['buildtype=debugoptimized','cpp_std=c++17'], version: '1.0.0')
+project('plocate', 'cpp', default_options: ['buildtype=debugoptimized','cpp_std=c++17'], version: '1.0.4-pre')
 
 # Make the version available as a #define.
 add_project_arguments('-DPLOCATE_VERSION="' + meson.project_version() + '"', language: 'cpp')
@@ -6,13 +6,14 @@ add_project_arguments('-DPLOCATE_VERSION="' + meson.project_version() + '"', lan
 cxx = meson.get_compiler('cpp')
 uringdep = dependency('liburing', required: false)
 zstddep = dependency('libzstd')
+threaddep = dependency('threads')
 
 if not uringdep.found()
 	add_project_arguments('-DWITHOUT_URING', language: 'cpp')
 endif
 
-executable('plocate', ['plocate.cpp', 'io_uring_engine.cpp', 'turbopfor.cpp', 'parse_trigrams.cpp'],
-	dependencies: [uringdep, zstddep],
+executable('plocate', ['plocate.cpp', 'io_uring_engine.cpp', 'turbopfor.cpp', 'parse_trigrams.cpp', 'serializer.cpp', 'access_rx_cache.cpp'],
+	dependencies: [uringdep, zstddep, threaddep],
 	install: true,
 	install_mode: ['rwxr-sr-x', 'root', 'mlocate'])
 executable('plocate-build', 'plocate-build.cpp',
@@ -20,9 +21,19 @@ executable('plocate-build', 'plocate-build.cpp',
 	install: true,
 	install_dir: get_option('sbindir'))
 
-install_data('update-plocate.sh',
-	install_dir: '/etc/cron.daily',
-	rename: 'plocate')
+conf_data = configuration_data()
+conf_data.set('PROCESSED_BY_MESON', '1')
+conf_data.set('sbindir', get_option('prefix') + '/' + get_option('sbindir'))
+conf_data.set('locategroup', get_option('locategroup'))
+update_script = configure_file(input: 'update-plocate.sh',
+               output: 'update-plocate.sh',
+               configuration: conf_data)
+
+if get_option('install_cron')
+	install_data(update_script,
+		install_dir: '/etc/cron.daily',
+		rename: 'plocate')
+endif
 install_man('plocate.1')
 install_man('plocate-build.8')
 
@@ -35,7 +46,7 @@ if run_command('[', '-r', pfordir + '/libic.a', ']').returncode() == 0
 	turbopfordep = declare_dependency(
 		include_directories: include_directories('TurboPFor-Integer-Compression'),
 		dependencies: meson.get_compiler('cpp').find_library('ic', dirs: pfordir))
-	executable('bench', ['bench.cpp', 'io_uring_engine.cpp'],
+	executable('bench', ['bench.cpp', 'io_uring_engine.cpp', 'turbopfor.cpp'],
 		dependencies: [uringdep, turbopfordep],
 		build_by_default: false,
 		install: false)