Skip to content

Commit c9fef40

Browse files
committed
Fix warnings
1 parent efb7651 commit c9fef40

File tree

7 files changed

+9
-23
lines changed

7 files changed

+9
-23
lines changed

meson.build

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -156,18 +156,11 @@ endif
156156
# deps
157157
dep_threads = dependency('threads', required: false)
158158

159-
dep_dlg = dependency('dlg',
160-
static: true,
161-
fallback: ['dlg', 'dlg_dep'])
162-
dep_nytl = dependency('nytl',
163-
fallback: ['nytl', 'nytl_dep'])
164-
dep_imgio = dependency('imgio',
165-
static: true,
166-
default_options: ['png=false'],
167-
fallback: ['imgio', 'imgio_dep'])
168-
dep_spc = dependency('spc',
169-
fallback: ['spc', 'spc_dep'],
170-
static: true)
159+
dopts = ['default_library=static']
160+
dep_dlg = subproject('dlg', default_options: dopts).get_variable('dlg_dep')
161+
dep_nytl = subproject('nytl', default_options: dopts).get_variable('nytl_dep')
162+
dep_imgio = subproject('imgio', default_options: dopts).get_variable('imgio_dep')
163+
dep_spc = subproject('spc', default_options: dopts).get_variable('spc_dep')
171164

172165
layer_args += '-DDLG_DEFAULT_TAGS="vil"'
173166

src/tao/pegtl/demangle.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#ifndef TAO_PEGTL_DEMANGLE_HPP
66
#define TAO_PEGTL_DEMANGLE_HPP
77

8-
#include <ciso646>
98
#include <string_view>
109

1110
namespace tao::pegtl

subprojects/dlg

Submodule dlg updated 1 file

subprojects/pml

subprojects/swa

subprojects/vkmockicd.wrap

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)