X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Futil%2Fmeson.build;h=5603020376335c113b33f182202cb1235768832f;hb=d35d7346d2446d8638b90425607c3f25fc339008;hp=a9ab5bf545c336705c67450681a361f281611d55;hpb=b4b2a951c8b4c1315c06cb4d58dbc787949daa4c;p=mesa.git diff --git a/src/util/meson.build b/src/util/meson.build index a9ab5bf545c..56030203763 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -23,17 +23,27 @@ inc_util = include_directories('.') subdir('xmlpool') files_mesa_util = files( + 'anon_file.h', + 'anon_file.c', + 'bigmath.h', 'bitscan.c', 'bitscan.h', 'bitset.h', + 'blob.c', + 'blob.h', 'build_id.c', 'build_id.h', 'crc32.c', 'crc32.h', + 'dag.c', 'debug.c', 'debug.h', 'disk_cache.c', 'disk_cache.h', + 'double.c', + 'double.h', + 'fast_idiv_by_const.c', + 'fast_idiv_by_const.h', 'format_r11g11b10f.h', 'format_rgb9e5.h', 'format_srgb.h', @@ -46,12 +56,21 @@ files_mesa_util = files( 'macros.h', 'mesa-sha1.c', 'mesa-sha1.h', + 'os_time.c', + 'os_time.h', + 'os_file.c', + 'os_misc.c', + 'os_misc.h', + 'u_process.c', + 'u_process.h', 'sha1/sha1.c', 'sha1/sha1.h', 'ralloc.c', 'ralloc.h', 'rand_xor.c', 'rand_xor.h', + 'rb_tree.c', + 'rb_tree.h', 'register_allocate.c', 'register_allocate.h', 'rgtc.c', @@ -63,12 +82,15 @@ files_mesa_util = files( 'simple_mtx.h', 'slab.c', 'slab.h', + 'softfloat.c', + 'softfloat.h', 'string_buffer.c', 'string_buffer.h', 'strndup.h', 'strtod.c', 'strtod.h', 'texcompress_rgtc_tmp.h', + 'timespec.h', 'u_atomic.c', 'u_atomic.h', 'u_dynarray.h', @@ -79,9 +101,31 @@ files_mesa_util = files( 'u_thread.h', 'u_vector.c', 'u_vector.h', + 'u_math.c', + 'u_math.h', + 'u_debug.c', + 'u_debug.h', + 'u_cpu_detect.c', + 'u_cpu_detect.h', + 'vma.c', + 'vma.h', ) -install_data('drirc', install_dir : get_option('sysconfdir')) +files_drirc = files('00-mesa-defaults.conf') + +install_data(files_drirc, install_dir : join_paths(get_option('datadir'), 'drirc.d')) + +if with_tests + prog_xmllint = find_program('xmllint', required : false, native : true) + if prog_xmllint.found() + test( + 'drirc xml validation', + prog_xmllint, + args : ['--noout', '--valid', files_drirc], + suite : ['util'], + ) + endif +endif files_xmlconfig = files( 'xmlconfig.c', @@ -92,49 +136,139 @@ format_srgb = custom_target( 'format_srgb', input : ['format_srgb.py'], output : 'format_srgb.c', - command : [prog_python2, '@INPUT0@'], + command : [prog_python, '@INPUT0@'], capture : true, ) -libmesa_util = static_library( +deps_for_libmesa_util = [ + dep_zlib, + dep_clock, + dep_thread, + dep_atomic, + dep_m, + dep_valgrind, +] + +if with_platform_android + deps_for_libmesa_util += dep_android +endif + +_libmesa_util = static_library( 'mesa_util', [files_mesa_util, format_srgb], include_directories : inc_common, - dependencies : [dep_zlib, dep_clock], + dependencies : deps_for_libmesa_util, c_args : [c_msvc_compat_args, c_vis_args], build_by_default : false ) -libxmlconfig = static_library( +idep_mesautil = declare_dependency( + link_with : _libmesa_util, + include_directories : inc_util, + dependencies : [dep_zlib, dep_clock, dep_thread, dep_atomic, dep_m], +) + +_libxmlconfig = static_library( 'xmlconfig', files_xmlconfig, include_directories : inc_common, - dependencies : [dep_expat, dep_m], - c_args : [c_msvc_compat_args, c_vis_args, - '-DSYSCONFDIR="@0@"'.format(get_option('sysconfdir'))], + dependencies : [idep_mesautil, dep_expat, dep_m], + c_args : [ + c_msvc_compat_args, c_vis_args, + '-DSYSCONFDIR="@0@"'.format( + join_paths(get_option('prefix'), get_option('sysconfdir')) + ), + '-DDATADIR="@0@"'.format( + join_paths(get_option('prefix'), get_option('datadir')) + ), + ], build_by_default : false, ) +idep_xmlconfig = declare_dependency( + sources : xmlpool_options_h, + include_directories : inc_util, + link_with : _libxmlconfig, + dependencies : dep_expat, +) + if with_tests - u_atomic_test = executable( - 'u_atomic_test', - files('u_atomic_test.c'), - include_directories : inc_common, - link_with : libmesa_util, - c_args : [c_msvc_compat_args], + test( + 'u_atomic', + executable( + 'u_atomic_test', + files('u_atomic_test.c'), + include_directories : inc_common, + dependencies : idep_mesautil, + c_args : [c_msvc_compat_args], + ), + suite : ['util'], ) - roundeven_test = executable( - 'roundeven_test', - files('roundeven_test.c'), - include_directories : inc_common, - c_args : [c_msvc_compat_args], - dependencies : [dep_m], + test( + 'blob', + executable( + 'blob_test', + files('blob_test.c'), + include_directories : inc_common, + dependencies : idep_mesautil, + c_args : [c_msvc_compat_args], + ), + suite : ['util'], ) - test('u_atomic', u_atomic_test) - test('roundeven', roundeven_test) + test( + 'rb_tree', + executable( + 'rb_tree_test', + files('rb_tree_test.c'), + include_directories : inc_common, + dependencies : idep_mesautil, + c_args : [c_msvc_compat_args], + ), + suite : ['util'], + ) + + test( + 'roundeven', + executable( + 'roundeven_test', + files('roundeven_test.c'), + include_directories : inc_common, + c_args : [c_msvc_compat_args], + dependencies : [dep_m], + ), + suite : ['util'], + ) + + test( + 'mesa-sha1', + executable( + 'mesa-sha1_test', + files('mesa-sha1_test.c'), + include_directories : inc_common, + dependencies : idep_mesautil, + c_args : [c_msvc_compat_args], + ), + suite : ['util'], + ) + + test( + 'bitset', + executable( + 'bitset_test', + files('bitset_test.cpp'), + include_directories : inc_common, + dependencies : [idep_mesautil, idep_gtest], + ), + suite : ['util'], + ) + subdir('tests/fast_idiv_by_const') + subdir('tests/fast_urem_by_const') subdir('tests/hash_table') subdir('tests/string_buffer') + subdir('tests/timespec') + subdir('tests/vma') + subdir('tests/set') endif