From 7d947759608f7b698306c058dc8e248a5d70f822 Mon Sep 17 00:00:00 2001 From: peelz Date: Fri, 17 May 2024 13:09:20 -0400 Subject: [PATCH 1/2] Bump meson version requirement to >= 1.4.0 --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index b5112aab..29e7225d 100644 --- a/meson.build +++ b/meson.build @@ -7,7 +7,7 @@ project( 'prefix=/usr', 'cpp_std=c++17', ], - meson_version: '>= 0.63.0', + meson_version: '>= 1.4.0', ) pk_version = meson.project_version() From 2a3d57ab82747d769d80a45d7eb5aa20da7b420b Mon Sep 17 00:00:00 2001 From: peelz Date: Wed, 26 Jun 2024 12:53:05 -0400 Subject: [PATCH 2/2] Don't hardcode path to config.h --- meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 29e7225d..620378ea 100644 --- a/meson.build +++ b/meson.build @@ -363,12 +363,12 @@ if enable_introspection dependency('gobject-introspection-1.0', version: '>= 0.6.2') endif -configure_file( +config_h = configure_file( output: 'config.h', configuration: config_data, ) -compiler_common_flags += ['-include', 'config.h'] +compiler_common_flags += ['-include', config_h.full_path()] add_project_arguments(compiler_common_flags + compiler_c_flags, language: 'c') add_project_arguments(compiler_common_flags + compiler_cpp_flags, language: 'cpp')