mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-10 00:08:07 +02:00
Make sure we use -isystem
with Meson on some deps
Otherwise we get warnings on external code.
This commit is contained in:
parent
0b96c586e0
commit
12717325cc
5 changed files with 10 additions and 8 deletions
|
@ -32,6 +32,7 @@ subdir('build-utils-meson/threads')
|
||||||
boost = dependency(
|
boost = dependency(
|
||||||
'boost',
|
'boost',
|
||||||
modules : ['container', 'context'],
|
modules : ['container', 'context'],
|
||||||
|
include_type: 'system',
|
||||||
)
|
)
|
||||||
# boost is a public dependency, but not a pkg-config dependency unfortunately, so we
|
# boost is a public dependency, but not a pkg-config dependency unfortunately, so we
|
||||||
# put in `deps_other`.
|
# put in `deps_other`.
|
||||||
|
@ -55,7 +56,12 @@ if bdw_gc.found()
|
||||||
endif
|
endif
|
||||||
configdata.set('HAVE_BOEHMGC', bdw_gc.found().to_int())
|
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
|
deps_other += toml11
|
||||||
|
|
||||||
config_h = configure_file(
|
config_h = configure_file(
|
||||||
|
|
|
@ -3,10 +3,7 @@
|
||||||
|
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
|
||||||
#pragma GCC diagnostic push
|
|
||||||
#pragma GCC diagnostic ignored "-Wswitch-enum"
|
|
||||||
#include <toml.hpp>
|
#include <toml.hpp>
|
||||||
#pragma GCC diagnostic pop
|
|
||||||
|
|
||||||
namespace nix {
|
namespace nix {
|
||||||
|
|
||||||
|
|
|
@ -73,6 +73,7 @@ subdir('build-utils-meson/threads')
|
||||||
boost = dependency(
|
boost = dependency(
|
||||||
'boost',
|
'boost',
|
||||||
modules : ['container'],
|
modules : ['container'],
|
||||||
|
include_type: 'system',
|
||||||
)
|
)
|
||||||
# boost is a public dependency, but not a pkg-config dependency unfortunately, so we
|
# boost is a public dependency, but not a pkg-config dependency unfortunately, so we
|
||||||
# put in `deps_other`.
|
# put in `deps_other`.
|
||||||
|
@ -113,7 +114,7 @@ if aws_s3.found()
|
||||||
'-laws-cpp-sdk-core',
|
'-laws-cpp-sdk-core',
|
||||||
'-laws-crt-cpp',
|
'-laws-crt-cpp',
|
||||||
],
|
],
|
||||||
)
|
).as_system('system')
|
||||||
endif
|
endif
|
||||||
deps_other += aws_s3
|
deps_other += aws_s3
|
||||||
|
|
||||||
|
|
|
@ -10,8 +10,6 @@
|
||||||
#include "compression.hh"
|
#include "compression.hh"
|
||||||
#include "filetransfer.hh"
|
#include "filetransfer.hh"
|
||||||
|
|
||||||
#pragma GCC diagnostic push
|
|
||||||
#pragma GCC diagnostic ignored "-Wswitch-enum"
|
|
||||||
#include <aws/core/Aws.h>
|
#include <aws/core/Aws.h>
|
||||||
#include <aws/core/VersionConfig.h>
|
#include <aws/core/VersionConfig.h>
|
||||||
#include <aws/core/auth/AWSCredentialsProvider.h>
|
#include <aws/core/auth/AWSCredentialsProvider.h>
|
||||||
|
@ -27,7 +25,6 @@
|
||||||
#include <aws/s3/model/ListObjectsRequest.h>
|
#include <aws/s3/model/ListObjectsRequest.h>
|
||||||
#include <aws/s3/model/PutObjectRequest.h>
|
#include <aws/s3/model/PutObjectRequest.h>
|
||||||
#include <aws/transfer/TransferManager.h>
|
#include <aws/transfer/TransferManager.h>
|
||||||
#pragma GCC diagnostic pop
|
|
||||||
|
|
||||||
using namespace Aws::Transfer;
|
using namespace Aws::Transfer;
|
||||||
|
|
||||||
|
|
|
@ -62,6 +62,7 @@ endif
|
||||||
boost = dependency(
|
boost = dependency(
|
||||||
'boost',
|
'boost',
|
||||||
modules : ['context', 'coroutine'],
|
modules : ['context', 'coroutine'],
|
||||||
|
include_type: 'system',
|
||||||
)
|
)
|
||||||
# boost is a public dependency, but not a pkg-config dependency unfortunately, so we
|
# boost is a public dependency, but not a pkg-config dependency unfortunately, so we
|
||||||
# put in `deps_other`.
|
# put in `deps_other`.
|
||||||
|
|
Loading…
Reference in a new issue