commit 5d482d9bfd8734f1824480d176e41ec01f7c5070
author Brad Bishop <bradleyb@fuzziesquirrel.com> Sun Nov 08 09:45:18 2020 -0500
committer Jayanth Othayoth <ojayanth@in.ibm.com> Wed Nov 11 16:42:32 2020 +0000
tree 13f29be7dc25d8269ece4772b18329037b83753f
parent 9d7976a8f23fd8a9975821ee80fbf2b74ac20ae7

test: remove gtest subproject fallback

We don't have a gtest subproject, so remove the logic to fallback on
one.  This is a copy/paste mistake.

Change-Id: I06b7361f0b0f93f9358d4f0615bdb9d2130fa92d
Fixes: 919e408aaad453f94e1ff3d35440b8fc8a2f3e13
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

meson.build

diff --git a/meson.build b/meson.build
index 1fd04b5..f64f9e7 100644
--- a/meson.build
+++ b/meson.build
@@ -131,15 +131,6 @@
 endforeach
 
 if not get_option('tests').disabled()
-    gtest = dependency('gtest', main: true, disabler: true, required: false)
-    if not gtest.found() and build_tests.enabled()
-        cmake = import('cmake')
-        gtest_subproject = cmake.subproject('gtest')
-        cm_gtest = gtest_subproject.dependency('gtest')
-        cm_gtest_main = gtest_subproject.dependency('gtest_main')
-        gtest = declare_dependency(dependencies: [cm_gtest, cm_gtest_main, threads])
-    endif
-
     test(
         'utest',
         executable(
@@ -148,7 +139,7 @@
             'targeting.cpp',
             'filedescriptor.cpp',
             dependencies: [
-                gtest,
+                dependency('gtest', main: true),
                 dependency('phosphor-logging'),
             ],
             implicit_include_directories: false,