From d956f60f8680386cb463ac6aa25426899fa8b36e Mon Sep 17 00:00:00 2001 From: Stephan Lachnit Date: Fri, 12 Jun 2020 11:45:16 +0200 Subject: [PATCH] remove old system nvml build option Signed-off-by: Stephan Lachnit --- meson.build | 6 ------ meson_options.txt | 1 - src/meson.build | 2 +- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/meson.build b/meson.build index c38b73cc..0f028cde 100644 --- a/meson.build +++ b/meson.build @@ -207,11 +207,5 @@ elif sizeof_ptr == 4 pre_args += '-DMANGOHUD_ARCH="32bit"' endif -if get_option('use_system_nvml') - cpp_nvml_args = '-DUSE_SYSTEM_NVML' -else - cpp_nvml_args = [] -endif - subdir('modules/ImGui') subdir('src') diff --git a/meson_options.txt b/meson_options.txt index 1f458059..2c0394ed 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,6 +1,5 @@ option('glibcxx_asserts', type : 'boolean', value : false) option('use_system_vulkan', type : 'feature', value : 'disabled', description: 'Use system vulkan headers instead of the provided ones') -option('use_system_nvml', type : 'boolean', value : false, description : 'Use system nvml headers instead of the provided ones') option('mangohud_prefix', type : 'string', value : '', description: 'Add prefix to cross-compiled library, like "lib32-".') 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') diff --git a/src/meson.build b/src/meson.build index 5790fcf5..db74c2af 100644 --- a/src/meson.build +++ b/src/meson.build @@ -52,6 +52,7 @@ if get_option('with_nvml') == 'system' if not nvml_h_found error('nvml.h was not found. Disable with \'-Dwith_nvml=disabled\' if gpu stats by NVML is not needed.') endif + pre_args += '-DUSE_SYSTEM_NVML' endif if nvml_h_found @@ -119,7 +120,6 @@ vklayer_mesa_overlay = shared_library( cpp_args : [ pre_args, cpp_vis_args, - cpp_nvml_args, vulkan_wsi_args ], dependencies : [