Module: Mesa Branch: main Commit: 97c4ce44e938360af2128dd42bfeff0a0716e687 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=97c4ce44e938360af2128dd42bfeff0a0716e687
Author: Matt Coster <[email protected]> Date: Mon Mar 7 14:45:51 2022 +0000 pvr: Gate offline compiler build behind -Dtools=imagination This matches the behavior of e.g. panfrost's bifrost_compiler target. Signed-off-by: Matt Coster <[email protected]> Reviewed-by: Erik Faye-Lund <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15284> --- meson.build | 1 + meson_options.txt | 2 +- src/imagination/rogue/meson.build | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 764381cdc0b..3258a98db7d 100644 --- a/meson.build +++ b/meson.build @@ -84,6 +84,7 @@ if with_tools.contains('all') 'nouveau', 'xvmc', 'asahi', + 'imagination', ] endif diff --git a/meson_options.txt b/meson_options.txt index 9fe70b11c28..0bff7efa29f 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -423,7 +423,7 @@ option( 'tools', type : 'array', value : [], - choices : ['drm-shim', 'etnaviv', 'freedreno', 'glsl', 'intel', 'intel-ui', 'nir', 'nouveau', 'xvmc', 'lima', 'panfrost', 'asahi', 'all', 'dlclose-skip'], + choices : ['drm-shim', 'etnaviv', 'freedreno', 'glsl', 'intel', 'intel-ui', 'nir', 'nouveau', 'xvmc', 'lima', 'panfrost', 'asahi', 'imagination', 'all', 'dlclose-skip'], description : 'List of tools to build. (Note: `intel-ui` selects `intel`)', ) option( diff --git a/src/imagination/rogue/meson.build b/src/imagination/rogue/meson.build index 240dfa207b1..f3f6945d5cf 100644 --- a/src/imagination/rogue/meson.build +++ b/src/imagination/rogue/meson.build @@ -19,6 +19,8 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. +with_imagination_tools = with_tools.contains('imagination') + libpowervr_rogue_files = files( 'nir/rogue_nir_constreg.c', 'nir/rogue_nir_lower_io.c', @@ -73,5 +75,6 @@ rogue_compiler = executable( inc_gallium_aux, inc_compiler, ], - install : false, + build_by_default : with_imagination_tools, + install : with_imagination_tools, )
