mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-25 23:39:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1391 from KindDragon/vtk-fix

Browse Source 
[vtk] Update to version 7.1.1
This commit is contained in:
Robert Schumacher 2017-07-04 20:03:56 -07:00 committed by GitHub
commit f17d5af64a
3 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/vtk/CONTROL
View File

@ -1,4 +1,4 @@
Source: vtk Source: vtk
Version: 7.1.0 Version: 7.1.1
Description: Software system for 3D computer graphics, image processing, and visualization Description: Software system for 3D computer graphics, image processing, and visualization
Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, qt5, msmpi Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, qt5, msmpi

20
ports/vtk/fix-findhdf5-shared.patch Normal file
View File

@ -0,0 +1,20 @@
diff --git a/CMake/FindHDF5.cmake b/CMake/FindHDF5.cmake
index 6d558e39b1..9511e9a1ad 100644
--- a/CMake/FindHDF5.cmake
+++ b/CMake/FindHDF5.cmake
@@ -3,11 +3,11 @@
# (BUG #0014363).
# include the default FindHDF5.cmake.
-if(CMAKE_VERSION VERSION_LESS 3.6.1)
+#if(CMAKE_VERSION VERSION_LESS 3.6.1)
include(${CMAKE_CURRENT_LIST_DIR}/NewCMake/FindHDF5.cmake)
-else()
- include(${CMAKE_ROOT}/Modules/FindHDF5.cmake)
-endif()
+#else()
+# include(${CMAKE_ROOT}/Modules/FindHDF5.cmake)
+#endif()
if(HDF5_FOUND AND (HDF5_IS_PARALLEL OR HDF5_ENABLE_PARALLEL))
include(vtkMPI)

9
ports/vtk/portfile.cmake
View File

@ -1,9 +1,9 @@
include(vcpkg_common_functions) include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/VTK-7.1.0) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/VTK-7.1.1)
vcpkg_download_distfile(ARCHIVE vcpkg_download_distfile(ARCHIVE
URLS "http://www.vtk.org/files/release/7.1/VTK-7.1.0.tar.gz" URLS "http://www.vtk.org/files/release/7.1/VTK-7.1.1.tar.gz"
FILENAME "VTK-7.1.0.tar.gz" FILENAME "VTK-7.1.1.tar.gz"
SHA512 83f0c9291cd2bc517a4bc449ad28a1d77e7ece169e846c7beab0b1140b9ef4b7bad30e3fa6e5a59826a707df78e2e336e07fa8bd30cf7498096ee80feef16534 SHA512 34a068801fe45f98325e5334d2569fc9b15ed38620386f1b5b860c9735e5fb8510953b50a3340d3ef9795e22fecf798c25bf750215b2ff1ff1eb7a1ecd87b623
) )
vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_extract_source_archive(${ARCHIVE})
@ -14,6 +14,7 @@ vcpkg_apply_patches(
${CMAKE_CURRENT_LIST_DIR}/transfer-hdf5-definitions.patch ${CMAKE_CURRENT_LIST_DIR}/transfer-hdf5-definitions.patch
${CMAKE_CURRENT_LIST_DIR}/netcdf-use-hdf5-definitions.patch ${CMAKE_CURRENT_LIST_DIR}/netcdf-use-hdf5-definitions.patch
${CMAKE_CURRENT_LIST_DIR}/dont-define-ssize_t.patch ${CMAKE_CURRENT_LIST_DIR}/dont-define-ssize_t.patch
${CMAKE_CURRENT_LIST_DIR}/fix-findhdf5-shared.patch
) )
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)