From 555d2f0f4d81e239d0d189b92c7611095bc0af04 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 30 May 2022 22:47:16 +0200 Subject: [PATCH] package/gtest: merge BR2_PACKAGE_GTEST_GMOCK blocks Since commit 6a9c6311f8fd4464b5555773589f587338f694a0, two BR2_PACKAGE_GTEST_GMOCK blocks are used instead of one which is a little bit unusual Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/gtest/gtest.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk index e7ce89a3f4..8ec5e9c535 100644 --- a/package/gtest/gtest.mk +++ b/package/gtest/gtest.mk @@ -13,10 +13,6 @@ GTEST_LICENSE_FILES = LICENSE GTEST_CPE_ID_VENDOR = google GTEST_CPE_ID_PRODUCT = google_test -ifeq ($(BR2_PACKAGE_GTEST_GMOCK),y) -GTEST_DEPENDENCIES += host-gtest -endif - HOST_GTEST_LICENSE = Apache-2.0 HOST_GTEST_LICENSE_FILES = googlemock/scripts/generator/LICENSE HOST_GTEST_DEPENDENCIES = host-python3 @@ -38,6 +34,7 @@ GTEST_CONF_OPTS += -DCMAKE_POSITION_INDEPENDENT_CODE=ON endif ifeq ($(BR2_PACKAGE_GTEST_GMOCK),y) +GTEST_DEPENDENCIES += host-gtest GTEST_CONF_OPTS += -DBUILD_GMOCK=ON else GTEST_CONF_OPTS += -DBUILD_GMOCK=OFF