luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-09-20 01:06:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'move-msvc-recommended-pragmas' into 'main'

Browse Source 
meson: Move msvc_recommended_pragmas.h to a subdirectory

See merge request GNOME/glib!3340
This commit is contained in:
Philip Withnall 2023-04-14 15:49:21 +00:00
commit 17295bd0b0
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glib/meson.build
View File

@ -150,6 +150,10 @@ glib_headers = files(
)
install_headers(glib_headers, install_dir : glib_includedir)
if host_system == 'windows'
install_headers([ 'msvc_recommended_pragmas.h' ], install_dir : glib_includedir)
endif
# Expose as variable to be used by gobject-introspection
# when it includes GLib as a subproject
glib_unix_h = files('glib-unix.h')

0
msvc_recommended_pragmas.h → glib/msvc_recommended_pragmas.h
View File

6
meson.build
View File

@ -37,7 +37,7 @@ cc_can_run = meson.can_run_host_binaries()
if cc.get_argument_syntax() == 'msvc'
# Ignore several spurious warnings for things glib does very commonly
# (also for clang-cl)
add_project_arguments('/FImsvc_recommended_pragmas.h',language : 'c')
add_project_arguments('/FIglib/msvc_recommended_pragmas.h', language : 'c')
endif
if cc.get_id() == 'msvc'
@ -2420,10 +2420,6 @@ endif
configure_file(output : 'config.h', configuration : glib_conf)
if host_system == 'windows'
install_headers([ 'msvc_recommended_pragmas.h' ], install_dir : glib_includedir)
endif
if get_option('man')
xsltproc = find_program('xsltproc', required : true)
xsltproc_command = [