diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | meson.build | 10 | ||||
| -rw-r--r-- | subprojects/boost-url.wrap | 3 | ||||
| -rw-r--r-- | subprojects/boost.wrap | 7 | ||||
| -rw-r--r-- | subprojects/packagefiles/boost-url/meson.build | 9 | ||||
| -rw-r--r-- | subprojects/packagefiles/boost/meson.build | 9 |
6 files changed, 31 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore index eb1140e26f..588f0fc5f8 100644 --- a/.gitignore +++ b/.gitignore @@ -201,6 +201,7 @@ local.properties # subproject directories /subprojects/* !/subprojects/*.wrap +!/subprojects/packagefiles # Meson Directories meson-logs diff --git a/meson.build b/meson.build index 8c86fa9eaf..12e51a3ec1 100644 --- a/meson.build +++ b/meson.build @@ -287,20 +287,14 @@ bmcweb_dependencies += nlohmann_json boost = dependency('boost',version : '>=1.79.0', required : false, include_type: 'system') if not boost.found() - subproject('boost', required: false) - boost_inc = include_directories('subprojects/boost_1_80_0/', is_system:true) - boost = declare_dependency(include_directories : boost_inc) - boost = boost.as_system('system') + boost = subproject('boost', required: true).get_variable('boost_dep') endif bmcweb_dependencies += boost if cxx.has_header('boost/url/url_view.hpp') boost_url = declare_dependency() else - subproject('boost-url', required: false) - boost_url_inc = include_directories('subprojects/boost-url/include', is_system:true) - boost_url= declare_dependency(include_directories : boost_url_inc) - boost_url = boost_url.as_system('system') + boost_url = subproject('boost-url', required: true).get_variable('boost_url_dep') endif bmcweb_dependencies += boost_url 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('.'), +) |