From e5d52c202ef638be7f9bc2fa0439f5b57b842dc1 Mon Sep 17 00:00:00 2001
From: jackun <jack.un@gmail.com>
Date: Thu, 14 Jul 2022 16:59:20 +0300
Subject: [PATCH] Add meson install_tags, bump meson to 0.60

---
 data/meson.build |  7 +++++--
 meson.build      |  2 +-
 src/meson.build  | 10 ++++++++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/data/meson.build b/data/meson.build
index a1e40e7b..31bd20de 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -18,13 +18,15 @@ endif
 # Install metainfo file
 install_data(
   metainfo_file,
-  install_dir: join_paths(datadir, 'metainfo')
+  install_dir: join_paths(datadir, 'metainfo'),
+  install_tag : 'doc',
 )
 
 # Install icon for metainfo
 install_data(
   icon_file,
   install_dir: join_paths(datadir, 'icons', 'hicolor', 'scalable', 'apps'),
+  install_tag : 'doc',
 )
 
 # Install man pages
@@ -42,5 +44,6 @@ endif
 install_data(
   files('MangoHud.conf'),
   install_dir : join_paths(get_option('datadir'), 'doc', 'mangohud'),
-  rename : ['MangoHud.conf.example']
+  rename : ['MangoHud.conf.example'],
+  install_tag : 'doc',
 )
diff --git a/meson.build b/meson.build
index 5b98c37f..11d6accd 100644
--- a/meson.build
+++ b/meson.build
@@ -2,7 +2,7 @@ project('MangoHud',
   ['c', 'cpp'],
   version : 'v0.6.7',
   license : 'MIT',
-  meson_version: '>=0.54.0',
+  meson_version: '>=0.60.0',
   default_options : ['buildtype=release', 'c_std=c99', 'cpp_std=c++14', 'warning_level=2']
 )
 
diff --git a/src/meson.build b/src/meson.build
index 193f6e53..be9c91e1 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -248,6 +248,7 @@ if get_option('mangoapp') and sizeof_ptr == 8
       json_dep,
     ],
     include_directories : [inc_common],
+    install_tag : 'mangoapp',
     link_args : link_args,
     install : true
   )
@@ -257,6 +258,7 @@ if get_option('mangohudctl') and sizeof_ptr == 8
 mangoapp = executable(
   'mangohudctl',
   files('app/control.cpp'),
+  install_tag : 'mangoapp', #TODO MangoHud layer itself currently doesn't support it
   install : true
 )
 endif
@@ -282,6 +284,7 @@ if get_option('mangoapp_layer')
     gnu_symbol_visibility : 'hidden',
     include_directories : [inc_common],
     link_args : link_args,
+    install_tag : 'mangoapp',
     install_dir : libdir_mangohud,
     install : true
   )
@@ -289,21 +292,24 @@ endif
 
 configure_file(input : 'mangohud.json.in',
   output : '@0@.json'.format(meson.project_name()),
-  configuration : {'ld_libdir_mangohud' : ld_libdir_mangohud_vk,
+  configuration : {'ld_libdir_mangohud' : ld_libdir_mangohud_vk.replace('\$', '$'),
                   'PROJECT_NAME' : meson.project_name().to_upper()},
   install : true,
   install_dir : join_paths(get_option('datadir'), 'vulkan', 'implicit_layer.d'),
+  install_tag : 'runtime',
 )
 
 configure_file(input : '../bin/mangohud.in',
   output : 'mangohud',
   configuration : conf_data,
   install_dir : get_option('bindir'),
+  install_tag : 'scripts',
 )
 
 configure_file(input : 'app/layer.json.in',
   output : 'libMangoApp.json',
-  configuration : {'ld_libdir_mangohud' : ld_libdir_mangohud_vk},
+  configuration : {'ld_libdir_mangohud' : ld_libdir_mangohud_vk.replace('\$', '$')},
   install : true,
   install_dir : join_paths(get_option('datadir'), 'vulkan', 'implicit_layer.d'),
+  install_tag : 'mangoapp',
 )