mirror of
https://github.com/gentoo-mirror/guru.git
synced 2025-04-19 07:49:00 -04:00
117 lines
4.1 KiB
Diff
117 lines
4.1 KiB
Diff
From c98df705d2a52dcc0322e6ce8626ee1cf8ad87dd Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Gon=C3=A7alo=20Negrier=20Duarte?=
|
|
<gonegrier.duarte@gmail.com>
|
|
Date: Thu, 9 May 2024 21:52:21 +0100
|
|
Subject: [PATCH] meson: verify if system lib are present before fallback to
|
|
submodules
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
* removed use_system_spdlog feature
|
|
* System vulkan-headers cant be use since mangohud don't use latest SDK
|
|
* The code is commented out for future use
|
|
* This is a backport for mangohud-0.7.1 of: aa7875942f5a0b7fdd187916b898b0b63c9a886c
|
|
* (see: https://github.com/flightlessmango/MangoHud/pull/1321)
|
|
|
|
Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte@gmail.com>
|
|
---
|
|
meson.build | 45 ++++++++++++++++++++++++---------------------
|
|
meson_options.txt | 1 -
|
|
2 files changed, 24 insertions(+), 22 deletions(-)
|
|
|
|
diff --git a/meson.build b/meson.build
|
|
index 3bf3918..329ad6f 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -164,9 +164,16 @@ else
|
|
dep_rt = null_dep
|
|
endif
|
|
|
|
-vkh_sp = subproject('vulkan-headers')
|
|
-vk_api_xml = vkh_sp.get_variable('vulkan_api_xml')
|
|
-dep_vulkan = vkh_sp.get_variable('vulkan_headers_dep')
|
|
+# Commented code can be used if mangohud start using latest SDK Vulkan-Headers
|
|
+# Allowing user to build mangohud using system Vulkan-Headers
|
|
+#if not dependency('VulkanHeaders').found()
|
|
+ vkh_sp = subproject('vulkan-headers')
|
|
+ vk_api_xml = vkh_sp.get_variable('vulkan_api_xml')
|
|
+ dep_vulkan = vkh_sp.get_variable('vulkan_headers_dep')
|
|
+#else
|
|
+# dep_vulkan = dependency('VulkanHeaders', required: true)
|
|
+# vk_api_xml = files('/usr/share/vulkan/registry/vk.xml')
|
|
+#endif
|
|
|
|
vk_enum_to_str = custom_target(
|
|
'vk_enum_to_str',
|
|
@@ -212,31 +219,25 @@ if get_option('mangoapp')
|
|
]
|
|
endif
|
|
|
|
-dearimgui_sp = subproject('imgui', default_options: imgui_options)
|
|
-dearimgui_dep = dearimgui_sp.get_variable('imgui_dep')
|
|
+dearimgui_dep = dependency('imgui', fallback: ['imgui', 'dearimgui_dep'], required: true, default_options: imgui_options)
|
|
|
|
if is_unixy
|
|
-implot_sp = subproject('implot', default_options: ['default_library=static'])
|
|
-implot_dep = implot_sp.get_variable('implot_dep')
|
|
+implot_dep = dependency('implot', fallback: ['implot', 'implot_deb'], required: true, default_options: ['default_library=static'])
|
|
else
|
|
implot_dep = null_dep
|
|
implot_lib = static_library('nulllib', [])
|
|
endif
|
|
|
|
-spdlog_dep = cpp.find_library('spdlog', required: get_option('use_system_spdlog'))
|
|
-if not spdlog_dep.found()
|
|
- spdlog_sp = subproject('spdlog', default_options: [
|
|
- 'default_library=static',
|
|
- 'compile_library=true',
|
|
- 'werror=false',
|
|
- 'tests=disabled',
|
|
- 'external_fmt=disabled',
|
|
- 'std_format=disabled'
|
|
- ])
|
|
- spdlog_dep = spdlog_sp.get_variable('spdlog_dep')
|
|
-else
|
|
- spdlog_dep = dependency('spdlog', required: true)
|
|
-endif
|
|
+spdlog_options = [
|
|
+ 'default_library=static',
|
|
+ 'compile_library=true',
|
|
+ 'werror=false',
|
|
+ 'tests=disabled',
|
|
+ 'external_fmt=disabled',
|
|
+ 'std_format=disabled'
|
|
+]
|
|
+
|
|
+spdlog_dep = dependency('spdlog', fallback: ['spdlog', 'spdlog_dep'], required: true, default_options: spdlog_options)
|
|
|
|
if ['windows', 'mingw'].contains(host_machine.system())
|
|
minhook_sp = subproject('minhook')
|
|
@@ -275,6 +276,7 @@ if get_option('tests').enabled()
|
|
dependencies: [
|
|
cmocka_dep,
|
|
spdlog_dep,
|
|
+ implot_dep,
|
|
dearimgui_dep
|
|
],
|
|
include_directories: inc_common)
|
|
@@ -287,3 +289,4 @@ endif
|
|
if get_option('mangoplot').enabled()
|
|
subdir('bin')
|
|
endif
|
|
+
|
|
diff --git a/meson_options.txt b/meson_options.txt
|
|
index c82ae15..2984dfe 100644
|
|
--- a/meson_options.txt
|
|
+++ b/meson_options.txt
|
|
@@ -1,5 +1,4 @@
|
|
option('glibcxx_asserts', type : 'boolean', value : false)
|
|
-option('use_system_spdlog', type : 'feature', value : 'disabled', description: 'Use system spdlog library')
|
|
option('append_libdir_mangohud', type : 'boolean', value : true, description: 'Append "mangohud" to libdir path or not.')
|
|
option('include_doc', type : 'boolean', value : true, description: 'Include the example config, man pages, appstream files etc.')
|
|
option('with_nvml', type : 'combo', value : 'enabled', choices: ['enabled', 'system', 'disabled'], description: 'Enable NVML support')
|
|
--
|
|
2.45.0
|
|
|