AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: inline inc_common

Browse Source 
Let's make it clear what includes are being added everywhere, so that
they can be cleaned up.

Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4360>
This commit is contained in:
Eric Engestrom
2019-03-05 16:21:47 +00:00
parent 5a32dda8e6
commit 79af30768d
98 changed files with 199 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/format/meson.build
+1 -1
View File
@@ -43,7 +43,7 @@ u_format_table_c = custom_target(
libmesa_format = static_library(
'mesa_format',
[files_mesa_format, u_format_table_c],
include_directories : inc_common,
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
dependencies : dep_m,
c_args : [c_msvc_compat_args, c_vis_args],
build_by_default : false
src/util/meson.build
+9 -9
View File
@@ -170,7 +170,7 @@ endif
_libmesa_util = static_library(
'mesa_util',
[files_mesa_util, format_srgb],
include_directories : inc_common,
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
dependencies : deps_for_libmesa_util,
link_with: libmesa_format,
c_args : [c_msvc_compat_args, c_vis_args],
@@ -186,7 +186,7 @@ idep_mesautil = declare_dependency(
_libxmlconfig = static_library(
'xmlconfig',
files_xmlconfig,
include_directories : inc_common,
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
dependencies : [idep_mesautil, dep_expat, dep_m],
c_args : [
c_msvc_compat_args, c_vis_args,
@@ -211,7 +211,7 @@ if with_tests
executable(
'u_atomic_test',
files('u_atomic_test.c'),
include_directories : inc_common,
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
dependencies : idep_mesautil,
c_args : [c_msvc_compat_args],
),
@@ -223,7 +223,7 @@ if with_tests
executable(
'blob_test',
files('blob_test.c'),
include_directories : inc_common,
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
dependencies : idep_mesautil,
c_args : [c_msvc_compat_args],
),
@@ -235,7 +235,7 @@ if with_tests
executable(
'rb_tree_test',
files('rb_tree_test.c'),
include_directories : inc_common,
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
dependencies : idep_mesautil,
c_args : [c_msvc_compat_args],
),
@@ -247,7 +247,7 @@ if with_tests
executable(
'roundeven_test',
files('roundeven_test.c'),
include_directories : inc_common,
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
c_args : [c_msvc_compat_args],
dependencies : [dep_m],
),
@@ -262,7 +262,7 @@ if with_tests
executable(
'mesa-sha1_test',
files('mesa-sha1_test.c'),
include_directories : inc_common,
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
link_with : _libmesa_util,
c_args : [c_msvc_compat_args],
),
@@ -275,7 +275,7 @@ if with_tests
executable(
'bitset_test',
files('bitset_test.cpp'),
include_directories : inc_common,
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
dependencies : [idep_mesautil, idep_gtest],
),
suite : ['util'],
@@ -284,7 +284,7 @@ if with_tests
process_test_exe = executable(
'process_test',
files('process_test.c'),
include_directories : inc_common,
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
dependencies : idep_mesautil,
c_args : [c_msvc_compat_args],
)
src/util/tests/fast_idiv_by_const/meson.build
+1 -1
View File
@@ -24,7 +24,7 @@ test(
'fast_idiv_by_const_test',
'fast_idiv_by_const_test.cpp',
dependencies : [idep_gtest, idep_mesautil],
include_directories : inc_common,
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
),
suite : ['util'],
timeout: 60,
src/util/tests/fast_urem_by_const/meson.build
+1 -1
View File
@@ -25,7 +25,7 @@ test(
'fast_urem_by_const_test',
'fast_urem_by_const_test.cpp',
dependencies : [idep_gtest, idep_mesautil],
include_directories : inc_common,
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
),
suite : ['util'],
)
src/util/tests/format/meson.build
+1 -1
View File
@@ -3,7 +3,7 @@ foreach t : ['srgb', 'u_format_test', 'u_format_compatible_test']
executable(
t,
'@0@.c'.format(t),
include_directories : inc_common,
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
dependencies : idep_mesautil,
),
suite : 'format',
src/util/tests/set/meson.build
+1 -1
View File
@@ -24,7 +24,7 @@ test(
'set_test',
'set_test.cpp',
dependencies : [dep_thread, dep_dl, idep_gtest, idep_mesautil],
include_directories : inc_common,
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
),
suite : ['util'],
)
src/util/tests/sparse_array/meson.build
+1 -1
View File
@@ -24,7 +24,7 @@ test(
'multi_threaded',
'multi_threaded.c',
dependencies : [idep_mesautil],
include_directories : inc_common,
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
),
suite : ['util'],
timeout: 60,
src/util/tests/string_buffer/meson.build
+1 -1
View File
@@ -25,7 +25,7 @@ test(
'string_buffer_test.cpp',
cpp_args : [cpp_msvc_compat_args],
dependencies : [idep_gtest, idep_mesautil],
include_directories : inc_common,
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
),
suite : ['util'],
)
src/util/tests/timespec/meson.build
+1 -1
View File
@@ -24,7 +24,7 @@ test(
'timespec_test',
'timespec_test.cpp',
dependencies : [dep_thread, dep_dl, idep_gtest, idep_mesautil],
include_directories : inc_common,
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
),
suite : ['util'],
)
src/util/tests/vector/meson.build
+1 -1
View File
@@ -24,7 +24,7 @@ test(
'vector_test',
'vector_test.cpp',
dependencies : [idep_gtest, idep_mesautil],
include_directories : inc_common,
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
),
suite : ['util'],
)