diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2019-06-08 23:08:59 +0200 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-06-08 14:08:59 -0700 |
| commit | 2ca347614929463fed9a3075902d455929026fa4 (patch) | |
| tree | 72e9746e4378512db6cfb9b5d12e0709ba6acf9f /ports/netcdf-c/hdf5_2.patch | |
| parent | 388d219f256b75452c088b4cc2e16fd38f7f6995 (diff) | |
| download | vcpkg-2ca347614929463fed9a3075902d455929026fa4.tar.gz vcpkg-2ca347614929463fed9a3075902d455929026fa4.zip | |
[netcdf-c/hdf5] improve/correct linkage (#6771)
* [netcdf_c] improve HDF5 linkage
* [hdf5] add required HDF5 definitions not set by findHDF5
* [netcdf-c] Call chain HDF5: -> vcpkg_cmake_wrapper (old behvior)
-> port supplied FindHDF5 -> includes hdf5Config from HDF5_ROOT
* [hdf5] fix szip linkage...again..
will now double link against szip target but thats better than before
the double link issue does not hurt and should be resolved upstream
* revert find_dependency
requires include(CMakeFindDependencyMacro)
* [netcdf-c] removed unnecessary patch
Diffstat (limited to 'ports/netcdf-c/hdf5_2.patch')
| -rw-r--r-- | ports/netcdf-c/hdf5_2.patch | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/ports/netcdf-c/hdf5_2.patch b/ports/netcdf-c/hdf5_2.patch new file mode 100644 index 000000000..a3a3fb751 --- /dev/null +++ b/ports/netcdf-c/hdf5_2.patch @@ -0,0 +1,13 @@ +diff --git a/liblib/CMakeLists.txt b/liblib/CMakeLists.txt +index ea9b0294..3c7f427d 100644 +--- a/liblib/CMakeLists.txt ++++ b/liblib/CMakeLists.txt +@@ -83,7 +83,7 @@ IF(USE_HDF5 OR USE_NETCDF4) + # HDF5_HL_LIBRARY. + SET(TLL_LIBS ${HDF5_HL_LIBRARIES} ${HDF5_C_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY}) + ELSE() # Windows CMake defines HDF5_LIBRARIES. +- SET(TLL_LIBS ${HDF5_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY}) ++ SET(TLL_LIBS ${HDF5_HL_LIBRARIES} ${HDF5_C_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY}) + ENDIF() + ENDIF() + |