[Mesa-dev] [PATCH] intel: don't build tools without -Dtools=intel

[Eric Engestrom]

On Tuesday, 2018-08-07 11:42:52 +0100, Lionel Landwerlin wrote:
> 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 at intel.com>

Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>

> ---
>  src/intel/meson.build       |  4 +++-
>  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
>  )
> -- 
> 2.18.0
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev