[vtk] Don't define size_t. Override HDF5 library detection (bug in FindHDF5)

This commit is contained in:
Robert Schumacher 2017-02-28 05:45:42 -08:00
parent 30a8d6e730
commit 3ee7045070
2 changed files with 23 additions and 0 deletions

View File

@ -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@

View File

@ -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()