mirror of
https://github.com/cemu-project/vcpkg.git
synced 2025-02-24 11:37:12 +01:00
Merge pull request #2494 from albertziegenhagel/szip-2.1.1
[szip] Update to 2.1.1
This commit is contained in:
commit
c3a6f18eb9
@ -1,3 +1,3 @@
|
|||||||
Source: szip
|
Source: szip
|
||||||
Version: 2.1-2
|
Version: 2.1.1
|
||||||
Description: Szip compression software, providing lossless compression of scientific data
|
Description: Szip compression software, providing lossless compression of scientific data
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
--- a/src/CMakeLists.txt Mon Aug 03 17:10:33 2015
|
--- a/src/CMakeLists.txt Fri Feb 03 20:42:43 2017
|
||||||
+++ b/src/CMakeLists.txt Fri Jan 13 09:38:07 2017
|
+++ b/src/CMakeLists.txt Wed Jan 03 11:42:51 2018
|
||||||
@@ -22,20 +22,22 @@
|
@@ -22,20 +22,22 @@
|
||||||
${SZIP_SRC_SOURCE_DIR}/szlib.h
|
${SZIP_SRC_SOURCE_DIR}/szlib.h
|
||||||
)
|
)
|
||||||
@ -37,3 +37,14 @@
|
|||||||
|
|
||||||
if (BUILD_SHARED_LIBS)
|
if (BUILD_SHARED_LIBS)
|
||||||
add_library (${SZIP_LIBSH_TARGET} SHARED ${SZIP_SRCS} ${SZIP_PUBLIC_HEADERS})
|
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
|
||||||
|
@ -1,25 +1,12 @@
|
|||||||
include(vcpkg_common_functions)
|
include(vcpkg_common_functions)
|
||||||
|
|
||||||
# set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/szip-2.1)
|
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/szip-2.1.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)
|
|
||||||
vcpkg_download_distfile(ARCHIVE
|
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"
|
URLS "https://support.hdfgroup.org/ftp/lib-external/szip/2.1.1/src/szip-2.1.1.tar.gz"
|
||||||
FILENAME "CMake-hdf5-1.10.0-patch1.zip"
|
FILENAME "szip-2.1.1.tar.gz"
|
||||||
SHA512 ec2edb43438661323be5998ecf64c4dd537ddc7451e31f89390260d16883e60a1ccc1bf745bcb809af22f2bf7157d50331a33910b8ebf5c59cd50693dfb2ef8f
|
SHA512 ada6406efb096cd8a2daf8f9217fe9111a96dcae87e29d1c31f58ddd2ad2aa7bac03f23c7205dc9360f3b62d259461759330c7189ef0c2fe559704b1ea9d40dd
|
||||||
)
|
)
|
||||||
vcpkg_extract_source_archive(${ARCHIVE})
|
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(
|
vcpkg_apply_patches(
|
||||||
SOURCE_PATH ${SOURCE_PATH}
|
SOURCE_PATH ${SOURCE_PATH}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user