diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-02-28 05:45:42 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-02-28 06:02:05 -0800 |
| commit | 3ee7045070ee3de2dc12033a78a94e58aed4ce89 (patch) | |
| tree | f879f9bde60da66da8e910c6a8872cc275079b4d | |
| parent | 30a8d6e73084a1379202fa88dc4293d3f9d4dbf3 (diff) | |
| download | vcpkg-3ee7045070ee3de2dc12033a78a94e58aed4ce89.tar.gz vcpkg-3ee7045070ee3de2dc12033a78a94e58aed4ce89.zip | |
[vtk] Don't define size_t. Override HDF5 library detection (bug in FindHDF5)
| -rw-r--r-- | ports/vtk/dont-define-ssize_t.patch | 13 | ||||
| -rw-r--r-- | ports/vtk/portfile.cmake | 10 |
2 files changed, 23 insertions, 0 deletions
diff --git a/ports/vtk/dont-define-ssize_t.patch b/ports/vtk/dont-define-ssize_t.patch new file mode 100644 index 000000000..ba9b5e605 --- /dev/null +++ b/ports/vtk/dont-define-ssize_t.patch @@ -0,0 +1,13 @@ +diff --git a/ThirdParty/netcdf/vtknetcdf/ncconfig.h.in b/ThirdParty/netcdf/vtknetcdf/ncconfig.h.in +index 0a19c41..0d92371 100644 +--- a/ThirdParty/netcdf/vtknetcdf/ncconfig.h.in ++++ b/ThirdParty/netcdf/vtknetcdf/ncconfig.h.in +@@ -110,7 +110,7 @@ + #cmakedefine HAVE_LIBHDF5_HL + + /* Define to `int' if system doesn't define. */ +-#cmakedefine ssize_t @ssize_t@ ++/* #cmakedefine ssize_t @ssize_t@ */ + + /* Define to `int' if system doesn't define. */ + #cmakedefine ptrdiff_t @ptrdiff_t@ diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 89bda5db9..611023a61 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_apply_patches( ${CMAKE_CURRENT_LIST_DIR}/transfer-3rd-party-module-definitions.patch ${CMAKE_CURRENT_LIST_DIR}/transfer-hdf5-definitions.patch ${CMAKE_CURRENT_LIST_DIR}/netcdf-use-hdf5-definitions.patch + ${CMAKE_CURRENT_LIST_DIR}/dont-define-ssize_t.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) @@ -25,8 +26,10 @@ endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DBUILD_TESTING=OFF + -DBUILD_EXAMPLES=OFF -DVTK_Group_MPI=ON -DVTK_Group_Qt=ON -DVTK_QT_VERSION=5 @@ -50,7 +53,14 @@ vcpkg_configure_cmake( -DVTK_INSTALL_DATA_DIR=share/vtk/data -DVTK_INSTALL_DOC_DIR=share/vtk/doc -DVTK_INSTALL_PACKAGE_DIR=share/vtk + -DVTK_FORBID_DOWNLOADS=ON ${ADDITIONAL_OPTIONS} + OPTIONS_RELEASE + -DHDF5_C_LIBRARY=${CURRENT_INSTALLED_DIR}/lib/hdf5.lib + -DHDF5_C_HL_LIBRARY=${CURRENT_INSTALLED_DIR}/lib/hdf5_hl.lib + OPTIONS_DEBUG + -DHDF5_C_LIBRARY=${CURRENT_INSTALLED_DIR}/debug/lib/hdf5_D.lib + -DHDF5_C_HL_LIBRARY=${CURRENT_INSTALLED_DIR}/debug/lib/hdf5_hl_D.lib ) vcpkg_install_cmake() |