Make sure we use -isystem with Meson on some deps

Otherwise we get warnings on external code.
This commit is contained in:
John Ericson 2024-07-29 12:16:05 -04:00
parent 0b96c586e0
commit 12717325cc
5 changed files with 10 additions and 8 deletions

View file

@ -32,6 +32,7 @@ subdir('build-utils-meson/threads')
boost = dependency(
'boost',
modules : ['container', 'context'],
include_type: 'system',
)
# boost is a public dependency, but not a pkg-config dependency unfortunately, so we
# put in `deps_other`.
@ -55,7 +56,12 @@ if bdw_gc.found()
endif
configdata.set('HAVE_BOEHMGC', bdw_gc.found().to_int())
toml11 = dependency('toml11', version : '>=3.7.0', method : 'cmake')
toml11 = dependency(
'toml11',
version : '>=3.7.0',
method : 'cmake',
include_type: 'system',
)
deps_other += toml11
config_h = configure_file(

View file

@ -3,10 +3,7 @@
#include <sstream>
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wswitch-enum"
#include <toml.hpp>
#pragma GCC diagnostic pop
namespace nix {

View file

@ -73,6 +73,7 @@ subdir('build-utils-meson/threads')
boost = dependency(
'boost',
modules : ['container'],
include_type: 'system',
)
# boost is a public dependency, but not a pkg-config dependency unfortunately, so we
# put in `deps_other`.
@ -113,7 +114,7 @@ if aws_s3.found()
'-laws-cpp-sdk-core',
'-laws-crt-cpp',
],
)
).as_system('system')
endif
deps_other += aws_s3

View file

@ -10,8 +10,6 @@
#include "compression.hh"
#include "filetransfer.hh"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wswitch-enum"
#include <aws/core/Aws.h>
#include <aws/core/VersionConfig.h>
#include <aws/core/auth/AWSCredentialsProvider.h>
@ -27,7 +25,6 @@
#include <aws/s3/model/ListObjectsRequest.h>
#include <aws/s3/model/PutObjectRequest.h>
#include <aws/transfer/TransferManager.h>
#pragma GCC diagnostic pop
using namespace Aws::Transfer;

View file

@ -62,6 +62,7 @@ endif
boost = dependency(
'boost',
modules : ['context', 'coroutine'],
include_type: 'system',
)
# boost is a public dependency, but not a pkg-config dependency unfortunately, so we
# put in `deps_other`.