Fix blosc linkage in openvdb. issue #6561

This commit is contained in:
Alexander Neumann 2019-05-22 20:57:03 +02:00
parent a985f5b99d
commit 8eea936d62
3 changed files with 26 additions and 1 deletions

View File

@ -1,5 +1,5 @@
Source: openvdb
Version: 6.0.0-1
Version: 6.0.0-2
Build-Depends: boost-ptr-container, openexr, tbb, blosc, boost-iostreams, boost-system, boost-thread, boost-date-time, boost-any, boost-uuid, boost-interprocess
Description: Sparse volume data structure and tools

24
ports/openvdb/blosc.patch Normal file
View File

@ -0,0 +1,24 @@
diff --git a/cmake/FindBlosc.cmake b/cmake/FindBlosc.cmake
index 5ac3780c..61ba83bc 100644
--- a/cmake/FindBlosc.cmake
+++ b/cmake/FindBlosc.cmake
@@ -45,8 +45,8 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS ( Blosc
IF ( BLOSC_FOUND )
- SET ( BLOSC_LIBRARYDIR ${BLOSC_LOCATION}/lib
- CACHE STRING "Blosc library directories")
+# SET ( BLOSC_LIBRARYDIR ${BLOSC_LOCATION}/lib
+# CACHE STRING "Blosc library directories")
SET ( _blosc_library_name "blosc" )
@@ -61,8 +61,6 @@ IF ( BLOSC_FOUND )
ENDIF()
FIND_LIBRARY ( BLOSC_blosc_LIBRARY ${_blosc_library_name}
- PATHS ${BLOSC_LIBRARYDIR}
- NO_DEFAULT_PATH
NO_SYSTEM_ENVIRONMENT_PATH
)

View File

@ -11,6 +11,7 @@ vcpkg_from_github(
0002-add-custom-options.patch
0003-build-only-necessary-targets.patch
0004-add-necessary-head.patch
blosc.patch
)
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)