mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-27 04:12:19 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2494 from albertziegenhagel/szip-2.1.1

Browse Source 
[szip] Update to 2.1.1
This commit is contained in:
Alexander Karatarakis 2018-01-03 15:30:20 +02:00 committed by GitHub
commit c3a6f18eb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/szip/CONTROL
View File

@ -1,3 +1,3 @@
Source: szip
Version: 2.1-2
Version: 2.1.1
Description: Szip compression software, providing lossless compression of scientific data

15
ports/szip/disable-static-lib-in-shared-build.patch
View File

@ -1,5 +1,5 @@
--- a/src/CMakeLists.txt Mon Aug 03 17:10:33 2015
+++ b/src/CMakeLists.txt Fri Jan 13 09:38:07 2017
--- a/src/CMakeLists.txt Fri Feb 03 20:42:43 2017
+++ b/src/CMakeLists.txt Wed Jan 03 11:42:51 2018
@@ -22,20 +22,22 @@
${SZIP_SRC_SOURCE_DIR}/szlib.h
)
@ -37,3 +37,14 @@
if (BUILD_SHARED_LIBS)
add_library (${SZIP_LIBSH_TARGET} SHARED ${SZIP_SRCS} ${SZIP_PUBLIC_HEADERS})
@@ -62,8 +64,9 @@
if (SZIP_EXPORTED_TARGETS)
if (BUILD_SHARED_LIBS)
INSTALL_TARGET_PDB (${SZIP_LIBSH_TARGET} ${SZIP_INSTALL_BIN_DIR} libraries)
+ else()
+ INSTALL_TARGET_PDB (${SZIP_LIB_TARGET} ${SZIP_INSTALL_BIN_DIR} libraries)
endif (BUILD_SHARED_LIBS)
- INSTALL_TARGET_PDB (${SZIP_LIB_TARGET} ${SZIP_INSTALL_BIN_DIR} libraries)
install (
TARGETS

21
ports/szip/portfile.cmake
View File

@ -1,25 +1,12 @@
include(vcpkg_common_functions)
# set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/szip-2.1)
# vcpkg_download_distfile(ARCHIVE
# URLS "https://support.hdfgroup.org/ftp/lib-external/szip/2.1/src/szip-2.1.tar.gz"
# FILENAME "szip-2.1.tar.gz"
# SHA512 ea91b877bb061fe6c96988a3c4b705e101a6950e34e9be53d6a57455c6a625be0afa60f4a3cfdd09649205b9f8586cc25ea60fe07a8131579acf3826b35fb749
# )
# vcpkg_extract_source_archive(${ARCHIVE})
# NOTE: We use Szip from the HDF5 cmake package dir, because it includes a lot of fixes for the CMake build files
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/CMake-hdf5-1.10.0-patch1)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/szip-2.1.1)
vcpkg_download_distfile(ARCHIVE
URLS "http://hdf4.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.0-patch1/src/CMake-hdf5-1.10.0-patch1.zip"
FILENAME "CMake-hdf5-1.10.0-patch1.zip"
SHA512 ec2edb43438661323be5998ecf64c4dd537ddc7451e31f89390260d16883e60a1ccc1bf745bcb809af22f2bf7157d50331a33910b8ebf5c59cd50693dfb2ef8f
URLS "https://support.hdfgroup.org/ftp/lib-external/szip/2.1.1/src/szip-2.1.1.tar.gz"
FILENAME "szip-2.1.1.tar.gz"
SHA512 ada6406efb096cd8a2daf8f9217fe9111a96dcae87e29d1c31f58ddd2ad2aa7bac03f23c7205dc9360f3b62d259461759330c7189ef0c2fe559704b1ea9d40dd
)
vcpkg_extract_source_archive(${ARCHIVE})
set(ARCHIVE ${SOURCE_PATH}/SZip.tar.gz)
vcpkg_extract_source_archive(${ARCHIVE})
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/Szip)
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}