From 6a1c7b7c2eca2d52eceb32b628a38e484f71628e Mon Sep 17 00:00:00 2001
From: Philip Withnall <pwithnall@endlessos.org>
Date: Tue, 21 Mar 2023 14:21:18 +0000
Subject: [PATCH] meson: Move msvc_recommended_pragmas.h to a subdirectory
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It’s cluttering up the root directory.

This should introduce no functional changes.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
---
 glib/meson.build                                            | 4 ++++
 .../msvc_recommended_pragmas.h                              | 0
 meson.build                                                 | 6 +-----
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename msvc_recommended_pragmas.h => glib/msvc_recommended_pragmas.h (100%)

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
similarity index 100%
rename from msvc_recommended_pragmas.h
rename to glib/msvc_recommended_pragmas.h
diff --git a/meson.build b/meson.build
index 3576c5e6f..3027c1986 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 = [