mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-23 18:10:26 +08:00
2ca3476149
* [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
14 lines
531 B
Diff
14 lines
531 B
Diff
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()
|
|
|