diff --git a/subprojects/.gitignore b/subprojects/.gitignore new file mode 100644 index 000000000..e6f228fa3 --- /dev/null +++ b/subprojects/.gitignore @@ -0,0 +1,3 @@ +/packagecache/ + +/googletest-*/ diff --git a/subprojects/gtest.wrap b/subprojects/gtest.wrap new file mode 100644 index 000000000..ca5d699ec --- /dev/null +++ b/subprojects/gtest.wrap @@ -0,0 +1,10 @@ +[wrap-file] +directory = googletest-release-1.10.0 + +source_url = https://github.com/google/googletest/archive/release-1.10.0.zip +source_filename = gtest-1.10.0.zip +source_hash = 94c634d499558a76fa649edb13721dce6e98fb1e7018dfaeba3cd7a083945e91 + +patch_url = https://wrapdb.mesonbuild.com/v1/projects/gtest/1.10.0/1/get_zip +patch_filename = gtest-1.10.0-1-wrap.zip +patch_hash = 04ff14e8880e4e465f6260221e9dfd56fea6bc7cce4c4aff0dc528e4a2c8f514 diff --git a/test/meson.build b/test/meson.build index 25561f2ee..e6cb1cfb1 100644 --- a/test/meson.build +++ b/test/meson.build @@ -22,8 +22,9 @@ if compiler.get_id() == 'clang' and compiler.version().version_compare('>=9') ] endif +gtest_main_dep = dependency('gtest', main: true, fallback: ['gtest', 'gtest_main_dep']) gtest_dep = declare_dependency( - dependencies: [dependency('gtest', main: true)], + dependencies: [gtest_main_dep], compile_args: gtest_compile_args, )