diff options
author | Philip Withnall <philip@tecnocode.co.uk> | 2023-04-14 15:49:21 +0000 |
---|---|---|
committer | Philip Withnall <philip@tecnocode.co.uk> | 2023-04-14 15:49:21 +0000 |
commit | 17295bd0b0ec1087d56b7fe0fd15b9edc2b261f1 (patch) | |
tree | 5e18f13fbcd9041ab5847d069fd69257dc342d97 | |
parent | 1ebfe32c066e9a6725858d856d8168c25180f93f (diff) | |
parent | 6a1c7b7c2eca2d52eceb32b628a38e484f71628e (diff) | |
download | glib-17295bd0b0ec1087d56b7fe0fd15b9edc2b261f1.tar.gz |
Merge branch 'move-msvc-recommended-pragmas' into 'main'
meson: Move msvc_recommended_pragmas.h to a subdirectory
See merge request GNOME/glib!3340
-rw-r--r-- | glib/meson.build | 4 | ||||
-rw-r--r-- | glib/msvc_recommended_pragmas.h (renamed from msvc_recommended_pragmas.h) | 0 | ||||
-rw-r--r-- | meson.build | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/glib/meson.build b/glib/meson.build index da76fc005..744275649 100644 --- a/glib/meson.build +++ b/glib/meson.build @@ -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') diff --git a/msvc_recommended_pragmas.h b/glib/msvc_recommended_pragmas.h index 051a02ae4..051a02ae4 100644 --- a/msvc_recommended_pragmas.h +++ b/glib/msvc_recommended_pragmas.h diff --git a/meson.build b/meson.build index d8ab9196f..5e25b3f15 100644 --- a/meson.build +++ b/meson.build @@ -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 = [ |