diff options
| author | fuzzard <fuzzard@kodi.tv> | 2022-04-25 15:56:56 +1000 |
|---|---|---|
| committer | fuzzard <fuzzard@kodi.tv> | 2022-06-26 14:55:03 +1000 |
| commit | 1332d3f490666e01d20bfaf7b7cbabde64517516 (patch) | |
| tree | 6cbd8e2bbd7c24fe0aeb1056f8301ac16942846f /tools/depends | |
| parent | 352ae5dc5694a9cda0f6b36e5ed20e2cc73cf993 (diff) | |
[cmake] Build LibZip during cmake Build
libzip is only used by android.
It supports cmake build system, so lets just build during core cmake build in Find modules
rename folder to libzip to match libname
Diffstat (limited to 'tools/depends')
| -rw-r--r-- | tools/depends/target/Makefile | 2 | ||||
| -rw-r--r-- | tools/depends/target/libzip/LIBZIP-VERSION | 5 | ||||
| -rw-r--r-- | tools/depends/target/libzip/Makefile | 22 |
3 files changed, 16 insertions, 13 deletions
diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile index 274355d8bb..a5e4529404 100644 --- a/tools/depends/target/Makefile +++ b/tools/depends/target/Makefile @@ -83,7 +83,7 @@ endif ifeq ($(OS),android) EXCLUDED_DEPENDS = libcec libusb gtest - DEPENDS += dummy-libxbmc libuuid libzip + DEPENDS += dummy-libxbmc libuuid PYMODULE_DEPS = dummy-libxbmc LIBUUID = libuuid endif diff --git a/tools/depends/target/libzip/LIBZIP-VERSION b/tools/depends/target/libzip/LIBZIP-VERSION new file mode 100644 index 0000000000..af0835ba6d --- /dev/null +++ b/tools/depends/target/libzip/LIBZIP-VERSION @@ -0,0 +1,5 @@ +LIBNAME=libzip +VERSION=1.8.0 +ARCHIVE=$(LIBNAME)-$(VERSION).tar.xz +SHA512=fe94a26a2797dff7c9b27334f29982f8e523dd5095bf32ebcadc6443726864f0ff7b2e8bf243e52cad8f79297bc7a87d73fdbc35edae4ffc8ab6aa0bcc93b03e +BYPRODUCT=libzip.a diff --git a/tools/depends/target/libzip/Makefile b/tools/depends/target/libzip/Makefile index 147206ceda..5034951740 100644 --- a/tools/depends/target/libzip/Makefile +++ b/tools/depends/target/libzip/Makefile @@ -1,23 +1,21 @@ -include ../../Makefile.include -DEPS = ../../Makefile.include Makefile ../../download-files.include +include ../../Makefile.include LIBZIP-VERSION ../../download-files.include +DEPS = ../../Makefile.include LIBZIP-VERSION Makefile ../../download-files.include -# lib name, version -LIBNAME=libzip -VERSION=1.8.0 -SOURCE=$(LIBNAME)-$(VERSION) -ARCHIVE=$(SOURCE).tar.xz -SHA512=fe94a26a2797dff7c9b27334f29982f8e523dd5095bf32ebcadc6443726864f0ff7b2e8bf243e52cad8f79297bc7a87d73fdbc35edae4ffc8ab6aa0bcc93b03e -include ../../download-files.include +CMAKE_OPTIONS=-DBUILD_DOC:BOOL=OFF \ + -DBUILD_EXAMPLES:BOOL=OFF \ + -DBUILD_REGRESS:BOOL=OFF \ + -DBUILD_SHARED_LIBS:BOOL=OFF \ + -DBUILD_TOOLS:BOOL=OFF \ + -DCMAKE_BUILD_TYPE=Debug -LIBDYLIB=$(PLATFORM)/build/lib/libzip.a +LIBDYLIB=$(PLATFORM)/build/lib/$(BYPRODUCT) 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) - cd $(PLATFORM); $(CMAKE) -B build -DBUILD_DOC:BOOL=OFF -DBUILD_EXAMPLES:BOOL=OFF -DBUILD_REGRESS:BOOL=OFF -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_TOOLS:BOOL=OFF + cd $(PLATFORM); $(CMAKE) -B build ${CMAKE_OPTIONS} $(LIBDYLIB): $(PLATFORM) $(MAKE) -C $(PLATFORM)/build |