diff options
| author | Lionel Landwerlin <lionel.g.landwerlin@intel.com> | 2018-08-07 11:38:59 +0100 |
|---|---|---|
| committer | Lionel Landwerlin <lionel.g.landwerlin@intel.com> | 2018-08-07 11:58:47 +0100 |
| commit | 303e7b39b5df982b0870b2d09d52fbf36ff9a087 (patch) | |
| tree | 146428801d029c8d51f923376b15b80619bf56c5 /src/intel | |
| parent | c4f183492d9da25d6df0af61e099aa2c98133a5e (diff) | |
| download | mesa-303e7b39b5df982b0870b2d09d52fbf36ff9a087.tar.gz mesa-303e7b39b5df982b0870b2d09d52fbf36ff9a087.tar.bz2 mesa-303e7b39b5df982b0870b2d09d52fbf36ff9a087.zip | |
intel: don't build tools without -Dtools=intel
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107487
Fixes: 4334196ab325c6w ("intel: tools: simplify meson build")
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
Diffstat (limited to 'src/intel')
| -rw-r--r-- | src/intel/meson.build | 4 | ||||
| -rw-r--r-- | src/intel/tools/meson.build | 26 |
2 files changed, 15 insertions, 15 deletions
diff --git a/src/intel/meson.build b/src/intel/meson.build index ccaf16a76f9..37a231f9567 100644 --- a/src/intel/meson.build +++ b/src/intel/meson.build @@ -26,7 +26,9 @@ subdir('genxml') subdir('isl') subdir('common') subdir('compiler') -subdir('tools') +if with_tools.contains('intel') + subdir('tools') +endif if with_intel_vk subdir('vulkan') endif diff --git a/src/intel/tools/meson.build b/src/intel/tools/meson.build index ac99adb4e1e..cef0f2e956a 100644 --- a/src/intel/tools/meson.build +++ b/src/intel/tools/meson.build @@ -18,8 +18,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -build_intel_tools = with_tools.contains('intel') - aubinator = executable( 'aubinator', files('aubinator.c', 'intel_aub.h'), @@ -27,8 +25,8 @@ aubinator = executable( include_directories : [inc_common, inc_intel], link_with : [libintel_common, libintel_compiler, libintel_dev, libmesa_util], c_args : [c_vis_args, no_override_init_args], - build_by_default : build_intel_tools, - install : build_intel_tools + build_by_default : true, + install : true ) aubinator_error_decode = executable( @@ -38,8 +36,8 @@ aubinator_error_decode = executable( include_directories : [inc_common, inc_intel], link_with : [libintel_common, libintel_compiler, libintel_dev, libmesa_util], c_args : [c_vis_args, no_override_init_args], - build_by_default : build_intel_tools, - install : build_intel_tools + build_by_default : true, + install : true ) error2aub = executable( @@ -49,8 +47,8 @@ error2aub = executable( include_directories : [inc_common, inc_intel, inc_drm_uapi], link_with : [libintel_dev], c_args : [c_vis_args, no_override_init_args], - build_by_default : build_intel_tools, - install : build_intel_tools + build_by_default : true, + install : true ) sanitize_data = configuration_data() @@ -62,7 +60,7 @@ configure_file( input: 'intel_sanitize_gpu.in', output: '@BASENAME@', install_dir: get_option('bindir'), - install: build_intel_tools, + install: true, configuration: sanitize_data ) @@ -73,9 +71,9 @@ libintel_sanitize_gpu = shared_library( include_directories : [inc_common, inc_intel, inc_drm_uapi], link_with : [libintel_common, libmesa_util], c_args : [c_vis_args, no_override_init_args], - build_by_default : build_intel_tools, + build_by_default : true, install_dir: get_option('libexecdir'), - install: build_intel_tools + install: true ) configure_file( @@ -83,7 +81,7 @@ configure_file( output : '@BASENAME@', install_dir: get_option('bindir'), configuration: sanitize_data, - install: build_intel_tools + install: true ) libintel_dump_gpu = shared_library( @@ -94,7 +92,7 @@ libintel_dump_gpu = shared_library( include_directories : [inc_common, inc_intel, inc_drm_uapi], link_with : libintel_dev, c_args : [c_vis_args, no_override_init_args], - build_by_default : build_intel_tools, + build_by_default : true, install_dir: get_option('libexecdir'), - install: build_intel_tools + install: true ) |