diff options
author | lrknox <lrknox> | 2017-12-22 18:28:24 (GMT) |
---|---|---|
committer | lrknox <lrknox> | 2017-12-22 18:28:24 (GMT) |
commit | 86d8a4c267eccbc66d6ee6120c9099788853c40f (patch) | |
tree | 53f3d57003fb1f19faea8ca3a9393d44c3cdda0d /src/CMakeLists.txt | |
parent | b1223dd653e65e076af92b2dfe236f3704da81c8 (diff) | |
download | hdf5-86d8a4c267eccbc66d6ee6120c9099788853c40f.zip hdf5-86d8a4c267eccbc66d6ee6120c9099788853c40f.tar.gz hdf5-86d8a4c267eccbc66d6ee6120c9099788853c40f.tar.bz2 |
Revert "Merge pull request #826 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop"
This reverts commit b1223dd653e65e076af92b2dfe236f3704da81c8, reversing
changes made to b25f123f5f5e25c1447a6a02861cb7c7265c12f2.
Diffstat (limited to 'src/CMakeLists.txt')
-rw-r--r-- | src/CMakeLists.txt | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0552244..b163b8a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -885,7 +885,10 @@ 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 ${CMAKE_DL_LIBS}) + 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}) endif () set_global_variable (HDF5_LIBRARIES_TO_EXPORT ${HDF5_LIB_TARGET}) H5_SET_LIB_OPTIONS (${HDF5_LIB_TARGET} ${HDF5_LIB_NAME} STATIC) @@ -926,7 +929,10 @@ 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 ${CMAKE_DL_LIBS}) + 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}) 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}) |