Skip to content

Commit ad81112

Browse files
author
Cédric Tabin
committed
Update to libzip 1.11.3
1 parent cc182af commit ad81112

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ install:
6666
make -j3 install
6767
- |
6868
mkdir -p $THIRD_PARTY/libzip && cd $THIRD_PARTY/libzip
69-
travis_retry wget -O libzip.tar.gz "https://github.com/nih-at/libzip/archive/v1.11.2.tar.gz"
69+
travis_retry wget -O libzip.tar.gz "https://github.com/nih-at/libzip/archive/v1.11.3.tar.gz"
7070
tar xzf libzip.tar.gz --strip-components=1
7171
mkdir build && cd build
7272
cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=${THIRD_PARTY_PREFIX} -DCMAKE_INSTALL_PREFIX=${THIRD_PARTY_PREFIX} -DENABLE_COMMONCRYPTO=OFF -DENABLE_GNUTLS=OFF -DENABLE_MBEDTLS=OFF

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ZLIB_CFLAGS=-fPIC
44
ZLIB_VERSION=1.3.1
55
ZLIB_NAME=zlib-$(ZLIB_VERSION)
66
ZLIB=$(LIB)/$(ZLIB_NAME)
7-
LIBZIP_VERSION=1.11.2
7+
LIBZIP_VERSION=1.11.3
88
LIBZIP_NAME=libzip-$(LIBZIP_VERSION)
99
LIBZIP=$(LIB)/$(LIBZIP_NAME)
1010
LIBZIP_CMAKE=-DENABLE_COMMONCRYPTO=OFF -DENABLE_GNUTLS=OFF -DENABLE_MBEDTLS=OFF

README.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Compilation has been tested with:
1212

1313
Underlying libraries:
1414
- [ZLib](https://zlib.net) 1.3.1
15-
- [libzip](https://www.nih.at/libzip) 1.11.2
15+
- [libzip](https://www.nih.at/libzip) 1.11.3
1616
- [BZip2](https://www.sourceware.org/bzip2/) 1.0.8 (optional)
1717
- [ZSTD](https://github.com/facebook/zstd) 1.5.2 (optional)
1818
- [XZ-utils](https://tukaani.org/xz/) (optional)
@@ -68,7 +68,7 @@ make install
6868
- Click `Configure` & `Generate`
6969
- If CMake can't find zlib and/or libzip you need to set `CMAKE_PREFIX_PATH` to the directories where you installed those into
7070
(either via `-DCMAKE_PREFIX_PATH=<...>` or via the GUI)
71-
- Example: `-DCMAKE_PREFIX_PATH=/home/user/libzip-1.11.2:/home/user/zlib-1.3.1`
71+
- Example: `-DCMAKE_PREFIX_PATH=/home/user/libzip-1.11.3:/home/user/zlib-1.3.1`
7272
- Compile as usual
7373
- Linux: `make && make install`
7474
- Windows: Open generated project in MSVC. Build the `INSTALL` target to install.
@@ -95,14 +95,14 @@ Given that it was installed (via `CMAKE_INSTALL_PREFIX`) into a standard locatio
9595
`CMAKE_PREFIX_PATH` you can simply call `find_package(libzippp 3.0 REQUIRED)` and link against `libzippp::libzippp`.
9696

9797
When not using CMake to consume libzippp you have to pass its include directory to your compiler and link against `libzippp.{a,so}`.
98-
Do not forget to also link against libzip libraries e.g. in *lib/libzip-1.11.2/lib/.libs/*).
98+
Do not forget to also link against libzip libraries e.g. in *lib/libzip-1.11.3/lib/.libs/*).
9999
An example of compilation with g++:
100100

101101
```shell
102102
g++ -I./src \
103-
-I./lib/libzip-1.11.2/lib I./lib/libzip-1.11.2/build \
103+
-I./lib/libzip-1.11.3/lib I./lib/libzip-1.11.3/build \
104104
main.cpp libzippp.a \
105-
lib/libzip-1.11.2/lib/.libs/libzip.a \
105+
lib/libzip-1.11.3/lib/.libs/libzip.a \
106106
lib/zlib-1.3.1/libz.a
107107
```
108108

@@ -151,12 +151,12 @@ It may need some adjusting though.
151151

152152
0. Make sure you have cmake 3.10 (*cmake.exe* must be in the PATH) and MS Visual Studio 2012.
153153

154-
1. Download [libzip](http://www.nih.at/libzip/libzip-1.11.2.tar.gz) and [zlib](https://www.zlib.net/zlib-1.3.1.tar.gz) sources and extract them in the 'lib' folder.
154+
1. Download [libzip](http://www.nih.at/libzip/libzip-1.11.3.tar.gz) and [zlib](https://www.zlib.net/zlib-1.3.1.tar.gz) sources and extract them in the 'lib' folder.
155155
You should end up with the following structure:
156156
```
157157
libzippp/compile.bat
158158
libzippp/lib/zlib-1.3.1
159-
libzippp/lib/libzip-1.11.2
159+
libzippp/lib/libzip-1.11.3
160160
```
161161
2. Execute the *compile.bat* (simply double-click on it). The compilation should
162162
go without error.

compile.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
SET root=%cd%
55
SET zlib=lib\zlib-1.3.1
6-
SET libzip=lib\libzip-1.11.2
6+
SET libzip=lib\libzip-1.11.3
77

88
if not exist "%zlib%" goto error_zlib_not_found
99
if not exist "%libzip%" goto error_libzip_not_found

0 commit comments

Comments
 (0)