mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-10-01 06:21:56 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/gtest: merge BR2_PACKAGE_GTEST_GMOCK blocks

Browse Source 
Since commit 6a9c6311f8, two
BR2_PACKAGE_GTEST_GMOCK blocks are used instead of one which is a little
bit unusual

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 555d2f0f4d)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine
2022-05-30 22:47:16 +02:00
committed by Peter Korsgaard
parent 00e09cb2e2
commit 893271e7db
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
package/gtest/gtest.mk
View File

@@ -13,10 +13,6 @@ GTEST_LICENSE_FILES = LICENSE
GTEST_CPE_ID_VENDOR = google GTEST_CPE_ID_VENDOR = google
GTEST_CPE_ID_PRODUCT = google_test 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 = Apache-2.0
HOST_GTEST_LICENSE_FILES = googlemock/scripts/generator/LICENSE HOST_GTEST_LICENSE_FILES = googlemock/scripts/generator/LICENSE
HOST_GTEST_DEPENDENCIES = host-python3 HOST_GTEST_DEPENDENCIES = host-python3
@@ -38,6 +34,7 @@ GTEST_CONF_OPTS += -DCMAKE_POSITION_INDEPENDENT_CODE=ON
endif endif
ifeq ($(BR2_PACKAGE_GTEST_GMOCK),y) ifeq ($(BR2_PACKAGE_GTEST_GMOCK),y)
GTEST_DEPENDENCIES += host-gtest
GTEST_CONF_OPTS += -DBUILD_GMOCK=ON GTEST_CONF_OPTS += -DBUILD_GMOCK=ON
else else
GTEST_CONF_OPTS += -DBUILD_GMOCK=OFF GTEST_CONF_OPTS += -DBUILD_GMOCK=OFF