aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

Merge pull request #1384 from ailin-nemui/meson-system-includes

Browse Source 
use -isystem instead of -I for include directories

(cherry picked from commit 593afc2e40)
This commit is contained in:
ailin-nemui 2022-06-18 12:43:01 +02:00 committed by Ailin Nemui
parent 0e0bc17992
commit 3404d822c8
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
meson.build
View File

@ -168,7 +168,7 @@ message('*** Or alternatively install your distribution\'s package')
message('*** On Debian: sudo apt-get install libglib2.0-dev') message('*** On Debian: sudo apt-get install libglib2.0-dev')
message('*** On Redhat: dnf install glib2-devel') message('*** On Redhat: dnf install glib2-devel')
if not require_glib_internal if not require_glib_internal
glib_dep = dependency('glib-2.0', version : '>=2.32', required : not want_glib_internal, static : want_static_dependency) glib_dep = dependency('glib-2.0', version : '>=2.32', required : not want_glib_internal, static : want_static_dependency, include_type : 'system')
else else
glib_dep = dependency('', required : false) glib_dep = dependency('', required : false)
endif endif
@ -250,9 +250,9 @@ if not glib_dep.found()
dependencies : glib_internal_dependencies, dependencies : glib_internal_dependencies,
sources : glib_internal_build_t, sources : glib_internal_build_t,
compile_args : [ compile_args : [
'-I' + (meson.current_source_dir() / 'subprojects' / glib_internal_version / 'glib'), '-isystem' + (meson.current_source_dir() / 'subprojects' / glib_internal_version / 'glib'),
'-I' + (meson.current_source_dir() / 'subprojects' / glib_internal_version), '-isystem' + (meson.current_source_dir() / 'subprojects' / glib_internal_version),
'-I' + (meson.current_build_dir() / 'build-subprojects' / 'glib' / 'glib'), '-isystem' + (meson.current_build_dir() / 'build-subprojects' / 'glib' / 'glib'),
], ],
link_args : [ meson.current_build_dir() / 'build-subprojects' / 'glib' / 'glib' / 'libglib-2.0.a' ], link_args : [ meson.current_build_dir() / 'build-subprojects' / 'glib' / 'glib' / 'libglib-2.0.a' ],
) )
@ -265,12 +265,12 @@ if not glib_dep.found()
gmodule_dep = declare_dependency(sources : glib_internal_build_t, gmodule_dep = declare_dependency(sources : glib_internal_build_t,
dependencies : libdl_dep, dependencies : libdl_dep,
compile_args : [ compile_args : [
'-I' + (meson.current_source_dir() / 'subprojects' / glib_internal_version / 'gmodule'), '-isystem' + (meson.current_source_dir() / 'subprojects' / glib_internal_version / 'gmodule'),
], ],
link_args : [ meson.current_build_dir() / 'build-subprojects' / 'glib' / 'gmodule' / 'libgmodule-2.0.a' ], link_args : [ meson.current_build_dir() / 'build-subprojects' / 'glib' / 'gmodule' / 'libgmodule-2.0.a' ],
) )
else else
gmodule_dep = dependency('gmodule-2.0', static : want_static_dependency) gmodule_dep = dependency('gmodule-2.0', static : want_static_dependency, include_type : 'system')
endif endif
dep += glib_dep dep += glib_dep
dep += gmodule_dep dep += gmodule_dep
@ -279,7 +279,7 @@ if glib_internal and want_static_dependency and want_fuzzer
openssl_proj = subproject('openssl', default_options : ['default_library=static', 'asm=disabled']) openssl_proj = subproject('openssl', default_options : ['default_library=static', 'asm=disabled'])
openssl_dep = openssl_proj.get_variable('openssl_dep') openssl_dep = openssl_proj.get_variable('openssl_dep')
else else
openssl_dep = dependency('openssl', static : want_static_dependency) openssl_dep = dependency('openssl', static : want_static_dependency, include_type : 'system')
endif endif
dep += openssl_dep dep += openssl_dep
@ -338,6 +338,9 @@ if want_perl
endif endif
foreach fl : perl_ccopts foreach fl : perl_ccopts
if fl.startswith('-D') or fl.startswith('-U') or fl.startswith('-I') or fl.startswith('-i') or fl.startswith('-f') or fl.startswith('-m') if fl.startswith('-D') or fl.startswith('-U') or fl.startswith('-I') or fl.startswith('-i') or fl.startswith('-f') or fl.startswith('-m')
if fl.startswith('-I')
fl = '-isystem' + fl.split('-I')[1]
endif
perl_cflags += fl perl_cflags += fl
endif endif
endforeach endforeach
@ -469,8 +472,8 @@ endif
have_otr = false have_otr = false
if want_otr if want_otr
libgcrypt = dependency('libgcrypt', version : '>=1.2.0', required : require_otr, static : want_static_dependency) libgcrypt = dependency('libgcrypt', version : '>=1.2.0', required : require_otr, static : want_static_dependency, include_type : 'system')
libotr = dependency('libotr', version : '>=4.1.0', required : require_otr, static : want_static_dependency) libotr = dependency('libotr', version : '>=4.1.0', required : require_otr, static : want_static_dependency, include_type : 'system')
if libgcrypt.found() and libotr.found() if libgcrypt.found() and libotr.found()
dep += libgcrypt dep += libgcrypt
dep += libotr dep += libotr