diff options
author | Vailin Choi <vchoi@jam.ad.hdfgroup.org> | 2018-01-12 23:51:42 (GMT) |
---|---|---|
committer | Vailin Choi <vchoi@jam.ad.hdfgroup.org> | 2018-01-12 23:51:42 (GMT) |
commit | 120d02657b4c7dff45dd8e83b8f1aaa0c7e51373 (patch) | |
tree | 19935f8689df3319e6661f8b393d6eda16cefd45 /src/CMakeLists.txt | |
parent | 37318f109a294bb47e5040be5888963967c1badc (diff) | |
parent | aef900c6741aea851b218169648185b1c8e5e435 (diff) | |
download | hdf5-120d02657b4c7dff45dd8e83b8f1aaa0c7e51373.zip hdf5-120d02657b4c7dff45dd8e83b8f1aaa0c7e51373.tar.gz hdf5-120d02657b4c7dff45dd8e83b8f1aaa0c7e51373.tar.bz2 |
Merge branch develop into bugfix/version_bounds
Diffstat (limited to 'src/CMakeLists.txt')
-rw-r--r-- | src/CMakeLists.txt | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b163b8a..0552244 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -885,10 +885,7 @@ add_library (${HDF5_LIB_TARGET} STATIC ${common_SRCS} ${gen_SRCS} ${H5_PUBLIC_HE TARGET_C_PROPERTIES (${HDF5_LIB_TARGET} STATIC " " " ") target_link_libraries (${HDF5_LIB_TARGET} PRIVATE ${LINK_LIBS} ${LINK_COMP_LIBS}) if (NOT WIN32) - target_link_libraries (${HDF5_LIB_TARGET} PUBLIC dl) -endif () -if (H5_HAVE_PARALLEL AND MPI_C_FOUND) - target_include_directories (${HDF5_LIB_TARGET} PUBLIC ${MPI_C_INCLUDE_DIRS}) + target_link_libraries (${HDF5_LIB_TARGET} PUBLIC ${CMAKE_DL_LIBS}) endif () set_global_variable (HDF5_LIBRARIES_TO_EXPORT ${HDF5_LIB_TARGET}) H5_SET_LIB_OPTIONS (${HDF5_LIB_TARGET} ${HDF5_LIB_NAME} STATIC) @@ -929,10 +926,7 @@ if (BUILD_SHARED_LIBS) TARGET_C_PROPERTIES (${HDF5_LIBSH_TARGET} SHARED " " " ") target_link_libraries (${HDF5_LIBSH_TARGET} PRIVATE ${LINK_LIBS} ${LINK_COMP_LIBS}) if (NOT WIN32) - target_link_libraries (${HDF5_LIBSH_TARGET} PUBLIC dl) - endif () - if (H5_HAVE_PARALLEL AND MPI_C_FOUND) - target_include_directories (${HDF5_LIBSH_TARGET} PUBLIC ${MPI_C_INCLUDE_DIRS}) + target_link_libraries (${HDF5_LIBSH_TARGET} PUBLIC ${CMAKE_DL_LIBS}) endif () set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_LIBSH_TARGET}") H5_SET_LIB_OPTIONS (${HDF5_LIBSH_TARGET} ${HDF5_LIB_NAME} SHARED ${HDF5_PACKAGE_SOVERSION}) |