meson: upgrade tinyxml wrap file
Use `meson wrap update tinyxml` to get the latest version (9.0.0)
and simplify the corresponding meson directives.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I7513c2dca11ad9728c530e2f44986916594b2407
diff --git a/meson.build b/meson.build
index 53d7a33..9c69257 100644
--- a/meson.build
+++ b/meson.build
@@ -291,12 +291,10 @@
bmcweb_dependencies += sdbusplus
if get_option('rest').enabled()
- tinyxml = dependency('tinyxml2', required: false)
- if not tinyxml.found()
- tinyxml_proj = subproject('tinyxml2', required: true)
- tinyxml = tinyxml_proj.get_variable('tinyxml2_dep')
- tinyxml = tinyxml.as_system('system')
- endif
+ tinyxml = dependency('tinyxml2',
+ default_options: ['tests=false'],
+ include_type: 'system',
+ )
bmcweb_dependencies += tinyxml
endif
diff --git a/subprojects/tinyxml2.wrap b/subprojects/tinyxml2.wrap
index 1b01769..f1fcec7 100644
--- a/subprojects/tinyxml2.wrap
+++ b/subprojects/tinyxml2.wrap
@@ -1,11 +1,9 @@
[wrap-file]
-directory = tinyxml2-7.0.1
+directory = tinyxml2-9.0.0
+source_url = https://github.com/leethomason/tinyxml2/archive/9.0.0.tar.gz
+source_filename = 9.0.0.tar.gz
+source_hash = cc2f1417c308b1f6acc54f88eb70771a0bf65f76282ce5c40e54cfe52952702c
-source_url = https://github.com/leethomason/tinyxml2/archive/7.0.1.tar.gz
-source_filename = 7.0.1.tar.gz
-source_hash = a381729e32b6c2916a23544c04f342682d38b3f6e6c0cad3c25e900c3a7ef1a6
-
-patch_url = https://wrapdb.mesonbuild.com/v1/projects/tinyxml2/7.0.1/1/get_zip
-patch_filename = tinyxml2-7.0.1-1-wrap.zip
-patch_hash = a40a3cf03a71075d21793c6b920a93cac07e75f1bdcd1637f04ee9d504fdb09b
+[provide]
+tinyxml2 = dep_tinyxml2