summaryrefslogtreecommitdiff
path: root/subprojects
diff options
context:
space:
mode:
authorEd Tanous <edtanous@google.com>2022-10-25 21:55:49 +0300
committerEd Tanous <ed@tanous.net>2022-11-01 23:54:40 +0300
commitf165deef76063f92ed319d10292be4eabfee0a89 (patch)
tree5f9a59dd38eb10995f036904d314fc4b2f87ef7a /subprojects
parenta9f68bb5f8e9cfe03fc8b31be5558d4bef20a5f4 (diff)
downloadbmcweb-f165deef76063f92ed319d10292be4eabfee0a89.tar.xz
Fix meson warnings
As written, when we pull in the boost and boost-url subprojects, we hit problems in the meson files. ``` ../meson.build:291: WARNING: include_directories sandbox violation! ``` This commit resolves this issue, by adding explicit meson.build files for both boost and boost-url. Tested: meson buildlocal No longer returns the above error, and shows Subprojects boost : YES boost-url : YES Whereas previously those two dependencies showed up as NO. Code compiles. Signed-off-by: Ed Tanous <edtanous@google.com> Change-Id: Ib25340723c8cb7d6139e3e51db023e9d90e30aab
Diffstat (limited to 'subprojects')
-rw-r--r--subprojects/boost-url.wrap3
-rw-r--r--subprojects/boost.wrap7
-rw-r--r--subprojects/packagefiles/boost-url/meson.build9
-rw-r--r--subprojects/packagefiles/boost/meson.build9
4 files changed, 28 insertions, 0 deletions
diff --git a/subprojects/boost-url.wrap b/subprojects/boost-url.wrap
index 1e30bc755b..d19baba12f 100644
--- a/subprojects/boost-url.wrap
+++ b/subprojects/boost-url.wrap
@@ -1,3 +1,6 @@
[wrap-git]
+directory = boost-url-git
+
revision = d740a92d38e3a8f4d5b2153f53b82f1c98e312ab
url = https://github.com/CPPAlliance/url.git
+patch_directory = boost-url
diff --git a/subprojects/boost.wrap b/subprojects/boost.wrap
index 1c2051abe9..75735f4d0a 100644
--- a/subprojects/boost.wrap
+++ b/subprojects/boost.wrap
@@ -1,4 +1,11 @@
[wrap-file]
+directory = boost_1_80_0
+
source_url = https://downloads.yoctoproject.org/mirror/sources/boost_1_80_0.tar.bz2
source_hash = 1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0
source_filename = 1_80_0.tar.bz2
+
+patch_directory = boost
+
+[provide]
+boost = boost_dep
diff --git a/subprojects/packagefiles/boost-url/meson.build b/subprojects/packagefiles/boost-url/meson.build
new file mode 100644
index 0000000000..7e64115838
--- /dev/null
+++ b/subprojects/packagefiles/boost-url/meson.build
@@ -0,0 +1,9 @@
+project('boost-url',
+ 'cpp',
+ version : '0.1',
+ license : 'Boost'
+)
+
+boost_url_dep = declare_dependency(
+ include_directories : include_directories('include'),
+)
diff --git a/subprojects/packagefiles/boost/meson.build b/subprojects/packagefiles/boost/meson.build
new file mode 100644
index 0000000000..9a9c2c5dc7
--- /dev/null
+++ b/subprojects/packagefiles/boost/meson.build
@@ -0,0 +1,9 @@
+project('boost',
+ 'cpp',
+ version : '1.80.0',
+ license : 'Boost'
+)
+
+boost_dep = declare_dependency(
+ include_directories : include_directories('.'),
+)