diff options
| author | fuzzard <fuzzard@kodi.tv> | 2022-03-04 14:09:36 +1000 |
|---|---|---|
| committer | fuzzard <fuzzard@kodi.tv> | 2022-03-07 20:07:34 +1000 |
| commit | 780aebfbd2e13a21fa09f3a65144c2162b0bfee8 (patch) | |
| tree | 2eb189d304659b78902ebc524adbc60b17c1ca1e /tools/depends | |
| parent | ff2648720c4943ba66de516a57f51bb63d2a3dcc (diff) | |
[tools/depends] rename googletest to gtest
rename googletest to just gtest. This brings some consistency to naming in other parts
of kodi cmake (eg target gtest)
Diffstat (limited to 'tools/depends')
| -rw-r--r-- | tools/depends/target/Makefile | 6 | ||||
| -rw-r--r-- | tools/depends/target/gtest/GTEST-VERSION (renamed from tools/depends/target/googletest/GOOGLETEST-VERSION) | 4 | ||||
| -rw-r--r-- | tools/depends/target/gtest/Makefile (renamed from tools/depends/target/googletest/Makefile) | 5 |
3 files changed, 7 insertions, 8 deletions
diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile index 83487c100c..883915f9fd 100644 --- a/tools/depends/target/Makefile +++ b/tools/depends/target/Makefile @@ -22,7 +22,7 @@ DEPENDS = \ gettext \ gmp \ gnutls \ - googletest \ + gtest \ harfbuzz \ libass \ libbluray \ @@ -68,7 +68,7 @@ else endif ifeq ($(OS),darwin_embedded) - EXCLUDED_DEPENDS = libcec libusb googletest + EXCLUDED_DEPENDS = libcec libusb gtest ifeq ($(TARGET_PLATFORM),appletvos) DEPENDS += boblight EXCLUDED_DEPENDS += libshairplay libplist @@ -84,7 +84,7 @@ ifeq ($(OS),osx) endif ifeq ($(OS),android) - EXCLUDED_DEPENDS = libcec libusb googletest + EXCLUDED_DEPENDS = libcec libusb gtest DEPENDS += dummy-libxbmc libuuid libandroidjni libzip PYMODULE_DEPS = dummy-libxbmc LIBUUID = libuuid diff --git a/tools/depends/target/googletest/GOOGLETEST-VERSION b/tools/depends/target/gtest/GTEST-VERSION index baa73efc7f..66e06e93c4 100644 --- a/tools/depends/target/googletest/GOOGLETEST-VERSION +++ b/tools/depends/target/gtest/GTEST-VERSION @@ -1,4 +1,4 @@ -LIBNAME=googletest +LIBNAME=gtest VERSION=1.10.0 -ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz +ARCHIVE=googletest-$(VERSION).tar.gz SHA512=bd52abe938c3722adc2347afad52ea3a17ecc76730d8d16b065e165bc7477d762bce0997a427131866a89f1001e3f3315198204ffa5d643a9355f1f4d0d7b1a9 diff --git a/tools/depends/target/googletest/Makefile b/tools/depends/target/gtest/Makefile index 88fe16082c..9a54702aec 100644 --- a/tools/depends/target/googletest/Makefile +++ b/tools/depends/target/gtest/Makefile @@ -1,11 +1,10 @@ -include ../../Makefile.include GOOGLETEST-VERSION ../../download-files.include -DEPS = ../../Makefile.include Makefile GOOGLETEST-VERSION ../../download-files.include +include ../../Makefile.include GTEST-VERSION ../../download-files.include +DEPS = ../../Makefile.include Makefile GTEST-VERSION ../../download-files.include LIBDYLIB=$(PLATFORM)/build/lib/libgtest.a all: .installed-$(PLATFORM) - $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) $(DEPS) rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) |