mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-03-13 17:18:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into par-cmake.wif

Browse Source
This commit is contained in:
Ward Fisher 2017-12-05 12:18:04 -07:00
commit 6da64fedca
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -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,12 @@ 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 "-lhdf5::hdf5-static" "-lhdf5" NC_LIBS ${NC_LIBS})
STRING(REPLACE "-lhdf5::hdf5_hl-static" "-lhdf5_hl" NC_LIBS ${NC_LIBS})
STRING(REPLACE ";" " " LINKFLAGS "${LINKFLAGS}")
LIST(REMOVE_DUPLICATES NC_LIBS)