diff options
| author | angelmixu <salemixu@gmail.com> | 2018-11-22 22:56:06 +0100 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-11-22 13:56:06 -0800 |
| commit | ea843854dfab4bd767c895bac3b6a02a1098cf4f (patch) | |
| tree | 341e4c8ebe470be532c611f9f8ebb71d3ab6fe35 | |
| parent | 5daa7cac278b281e32128b7c70da6e0e5ee40637 (diff) | |
| download | vcpkg-ea843854dfab4bd767c895bac3b6a02a1098cf4f.tar.gz vcpkg-ea843854dfab4bd767c895bac3b6a02a1098cf4f.zip | |
fix minizip on non windows builds (#4787)
* fix minizip on non windows builds
* [minizip] Bump control version
| -rw-r--r-- | ports/minizip/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | ports/minizip/CONTROL | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/ports/minizip/CMakeLists.txt b/ports/minizip/CMakeLists.txt index 9ebb5d217..0b572b39c 100644 --- a/ports/minizip/CMakeLists.txt +++ b/ports/minizip/CMakeLists.txt @@ -15,21 +15,27 @@ include_directories(${MIN_SRC} ${ZLIB_INCLUDE_DIRS} ${BZIP2_INCLUDE_DIR}) set(SRC ${MIN_SRC}/ioapi.c - ${MIN_SRC}/iowin32.c ${MIN_SRC}/unzip.c ${MIN_SRC}/zip.c ${MIN_SRC}/unzip.c ${MIN_SRC}/mztools.c ) +if(WIN32) + list(APPEND SRC ${MIN_SRC}/iowin32.c) +endif() + set(HEADERS ${MIN_SRC}/crypt.h ${MIN_SRC}/ioapi.h - ${MIN_SRC}/iowin32.h ${MIN_SRC}/unzip.h ${MIN_SRC}/zip.h ${MIN_SRC}/unzip.h ${MIN_SRC}/mztools.h ) +if(WIN32) + list(APPEND HEADERS ${MIN_SRC}/iowin32.h) +endif() + if(BUILD_SHARED_LIBS) set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) endif() diff --git a/ports/minizip/CONTROL b/ports/minizip/CONTROL index cc37b5f8c..60398b039 100644 --- a/ports/minizip/CONTROL +++ b/ports/minizip/CONTROL @@ -1,4 +1,4 @@ Source: minizip -Version: 1.2.11-2 +Version: 1.2.11-3 Description: Zip compression library Build-Depends: bzip2, zlib |