From 6b828cbae084a6acb1d6e51288d93f4a080f5664 Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Mon, 4 Dec 2017 13:50:43 -0600 Subject: [PATCH] Corrected for string reported by FindHDF5.cmake on Windows. --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b0c554fdf..35cc2ecda 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1797,10 +1797,6 @@ IF(MSVC) DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT dependencies) - #INSTALL(DIRECTORY ${CMAKE_PREFIX_PATH} DESTINATION "deps" COMPONENT dependencies) - # INSTALL(FILES ${ALL_TLL_LIBS} - # DESTINATION ${CMAKE_INSTALL_LIBDIR} - # COMPONENT dependencies) ENDIF() # Subdirectory CMakeLists.txt files should specify their own @@ -1842,6 +1838,10 @@ ENDFOREACH() SET(NC_LIBS "-lnetcdf ${NC_LIBS}") STRING(REPLACE ";" " " NC_LIBS "${NC_LIBS}") +STRING(REPLACE "-lhdf5::hdf5-shared" "-lhdf5" NC_LIBS ${NC_LIBS}) +STRING(REPLACE "-lhdf5::hdf5_hl-shared" "-lhdf5_hl" NC_LIBS ${NC_LIBS}) + + STRING(REPLACE ";" " " LINKFLAGS "${LINKFLAGS}") LIST(REMOVE_DUPLICATES NC_LIBS)