[vtk] reenable patch to disable a FindHDF5 workaround

This commit is contained in:
Albert Ziegenhagel 2017-08-08 17:56:09 +02:00
parent eb5b7e149f
commit 614218c18c
2 changed files with 27 additions and 0 deletions

View File

@ -0,0 +1,21 @@
--- a/CMake/vtkModuleMacros.cmake Mon Jun 26 15:29:04 2017
+++ b/CMake/vtkModuleMacros.cmake Tue Aug 08 17:54:03 2017
@@ -893,18 +893,6 @@
set(vtk${_lower}_LIBRARIES "${${_upper_pkg_name}_LIBRARIES}")
endif()
- #a workaround for bad FindHDF5 behavior in which deb or opt can
- #end up empty. cmake >= 2.8.12.2 makes this unnecessary
- string(REGEX MATCH "debug;.*optimized;.*"
- _remove_deb_opt "${vtk${_lower}_LIBRARIES}")
- if (_remove_deb_opt)
- set(_tmp ${vtk${_lower}_LIBRARIES})
- list(REMOVE_ITEM _tmp "debug")
- list(REMOVE_ITEM _tmp "optimized")
- list(REMOVE_DUPLICATES _tmp)
- set(vtk${_lower}_LIBRARIES ${_tmp})
- endif()
-
set(vtk${_lower}_INCLUDE_DIRS "")
else()
if(_nolibs)

View File

@ -8,6 +8,12 @@ vcpkg_from_github(
HEAD_REF "master"
)
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
${CMAKE_CURRENT_LIST_DIR}/disable-workaround-findhdf5.patch
)
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
list(APPEND ADDITIONAL_OPTIONS "-DVTK_EXTERNAL_HDF5_IS_SHARED=ON")
endif()