[blosc] Update to 1.13.5

static-install-fix.patch no longer required (upstream contains the patched version).
Resolves build error with VS 15.6 in static builds
This commit is contained in:
Alexander Karatarakis 2018-02-07 18:43:10 -08:00
parent 1e3435e32b
commit ca1e6d8ab7
3 changed files with 3 additions and 24 deletions

View File

@ -1,4 +1,4 @@
Source: blosc
Version: 1.12.1
Version: 1.13.5
Build-Depends: lz4, snappy, zlib, zstd
Description: A blocking, shuffling and loss-less compression library that can be faster than `memcpy()`

View File

@ -3,17 +3,11 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Blosc/c-blosc
REF v1.12.1
SHA512 f65bbbfce6fc59d0c5a0889d5771dd78cae2796244c6ee69edf15b27c4563c28ce789fded9104a8626d12be3e46418d596dfdb204c43e33abae8dca40debfd92
REF v1.13.5
SHA512 3ddc83c16c91d87959179f58bd23fe8e4bbd07c17312cdfdd0bc238a743e695f2914baf0b69efd923e8e54e8455699c8e528d3966d9126e15a8897d3c529db25
HEAD_REF master
)
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
${CMAKE_CURRENT_LIST_DIR}/static-install-fix.patch
)
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
set(BLOSC_STATIC ON)
set(BLOSC_SHARED OFF)

View File

@ -1,15 +0,0 @@
diff --git a/blosc/CMakeLists.txt b/blosc/CMakeLists.txt
index cd163f4..8cb1bdb 100644
--- a/blosc/CMakeLists.txt
+++ b/blosc/CMakeLists.txt
@@ -211,7 +211,9 @@ endif(BUILD_STATIC)
# install
if(BLOSC_INSTALL)
install(FILES blosc.h blosc-export.h DESTINATION include COMPONENT DEV)
- install(TARGETS blosc_shared DESTINATION ${lib_dir} COMPONENT LIB)
+ if(BUILD_SHARED)
+ install(TARGETS blosc_shared DESTINATION ${lib_dir} COMPONENT LIB)
+ endif(BUILD_SHARED)
if(BUILD_STATIC)
install(TARGETS blosc_static DESTINATION ${lib_dir} COMPONENT DEV)
endif(BUILD_STATIC)