Merge pull request #177 from OpenBrickProtocolFoundation/update-gtest

Update gtest + magic_enum

Author: Totto16

subprojects/gtest.wrap

@@ -1,13 +1,13 @@
 [wrap-file]
-directory = googletest-1.14.0
-source_url = https://github.com/google/googletest/archive/refs/tags/v1.14.0.tar.gz
-source_filename = gtest-1.14.0.tar.gz
-source_hash = 8ad598c73ad796e0d8280b082cebd82a630d73e73cd3c70057938a6501bba5d7
-patch_filename = gtest_1.14.0-2_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/gtest_1.14.0-2/get_patch
-patch_hash = 4ec7f767364386a99f7b2d61678287a73ad6ba0f9998be43b51794c464a63732
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/gtest_1.14.0-2/gtest-1.14.0.tar.gz
-wrapdb_version = 1.14.0-2
+directory = googletest-1.15.0
+source_url = https://github.com/google/googletest/archive/refs/tags/v1.15.0.tar.gz
+source_filename = gtest-1.15.0.tar.gz
+source_hash = 7315acb6bf10e99f332c8a43f00d5fbb1ee6ca48c52f6b936991b216c586aaad
+patch_filename = gtest_1.15.0-1_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/gtest_1.15.0-1/get_patch
+patch_hash = 5f8e484c48fdc1029c7fd08807bd2615f8c9d16f90df6d81984f4f292752c925
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/gtest_1.15.0-1/gtest-1.15.0.tar.gz
+wrapdb_version = 1.15.0-1
 
 [provide]
 gtest = gtest_dep

subprojects/magic_enum.wrap

@@ -1,12 +1,12 @@
 [wrap-file]
-directory = magic_enum-0.9.5
-source_url = https://github.com/Neargye/magic_enum/archive/refs/tags/v0.9.5.tar.gz
-source_filename = magic_enum-v0.9.5.tar.gz
-source_hash = 44ad80db5a72f5047e01d90e18315751d9ac90c0ab42cbea7a6f9ec66a4cd679
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/magic_enum_0.9.5-1/magic_enum-v0.9.5.tar.gz
-wrapdb_version = 0.9.5-1
+directory = magic_enum-0.9.6
+source_url = https://github.com/Neargye/magic_enum/archive/refs/tags/v0.9.6.tar.gz
+source_filename = magic_enum-v0.9.6.tar.gz
+source_hash = 814791ff32218dc869845af7eb89f898ebbcfa18e8d81aa4d682d18961e13731
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/magic_enum_0.9.6-1/magic_enum-v0.9.6.tar.gz
+wrapdb_version = 0.9.6-1
 
-diff_files = magic_enum-0.9.5_installed.diff
+diff_files = magic_enum-0.9.6_installed.diff
 
 [provide]
 magic_enum = magic_enum_dep

subprojects/packagefiles/magic_enum-0.9.5_installed.diff renamed to subprojects/packagefiles/magic_enum-0.9.6_installed.diff

@@ -1,21 +1,20 @@
 diff --git a/meson.build b/meson.build
-index c231c7f..66f96ac 100644
+index 207c834..9fe13a7 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -4,7 +4,7 @@ project(
-     version: '0.9.5',
+     version: '0.9.6',
  )
 
 -magic_enum_include = include_directories('include/magic_enum')
 +magic_enum_include = include_directories('include')
 
  magic_enum_args = []
 
-@@ -20,3 +20,18 @@ magic_enum_dep = declare_dependency(
- if get_option('test')
-     subdir('test')
- endif
-+
+@@ -17,6 +17,23 @@ magic_enum_dep = declare_dependency(
+     compile_args: magic_enum_args,
+ )
+ 
 +install_headers(
 +    files(
 +        'include/magic_enum/magic_enum.hpp',
@@ -30,3 +29,9 @@ index c231c7f..66f96ac 100644
 +    ),
 +    subdir: 'magic_enum',
 +)
++
+ if get_option('test')
+     subdir('test')
+ endif
++
++

tools/dependencies/meson.build

@@ -110,7 +110,7 @@ endif
 magic_enum_dep = dependency(
     'magic_enum',
     required: true,
-    default_options: {'test': false},
+    default_options: {'test': false, 'hash': true},
 )
 core_lib += {'deps': [core_lib.get('deps'), magic_enum_dep]}