diff options
| author | Albert Ziegenhagel <albert.ziegenhagel@outlook.com> | 2017-08-08 17:56:09 +0200 |
|---|---|---|
| committer | Albert Ziegenhagel <albert.ziegenhagel@outlook.com> | 2017-08-08 17:56:09 +0200 |
| commit | 614218c18cdc361a394a06180a7b646d42b9843c (patch) | |
| tree | a98ca1727497c954f0ac66f6d04075d9fdd19284 | |
| parent | eb5b7e149f93e073d6c6587942013cf31bf83cf9 (diff) | |
| download | vcpkg-614218c18cdc361a394a06180a7b646d42b9843c.tar.gz vcpkg-614218c18cdc361a394a06180a7b646d42b9843c.zip | |
[vtk] reenable patch to disable a FindHDF5 workaround
| -rw-r--r-- | ports/vtk/disable-workaround-findhdf5.patch | 21 | ||||
| -rw-r--r-- | ports/vtk/portfile.cmake | 6 |
2 files changed, 27 insertions, 0 deletions
diff --git a/ports/vtk/disable-workaround-findhdf5.patch b/ports/vtk/disable-workaround-findhdf5.patch new file mode 100644 index 000000000..004397048 --- /dev/null +++ b/ports/vtk/disable-workaround-findhdf5.patch @@ -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) diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 26cbb3d45..0e6e551f2 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -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() |