diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2017-11-17 20:51:25 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2017-11-17 20:51:25 (GMT) |
| commit | f3fd3f293f2734fea98f508f190bf531edc72f7a (patch) | |
| tree | d769484bdb107616fc287ccdc956b0f9f373ec48 /src/CMakeLists.txt | |
| parent | dc487ebad857d127a97a29d1cc7c55a6a38f30d1 (diff) | |
| parent | bb3fb6f13461d724baa635e464585cb49d8848d2 (diff) | |
| download | hdf5-f3fd3f293f2734fea98f508f190bf531edc72f7a.zip hdf5-f3fd3f293f2734fea98f508f190bf531edc72f7a.tar.gz hdf5-f3fd3f293f2734fea98f508f190bf531edc72f7a.tar.bz2 | |
Merge pull request #783 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'bb3fb6f13461d724baa635e464585cb49d8848d2':
HDFFV-10328 - fix typos
HDFFV-10328 remove allocation note
HDFFV-10328 - remove allocation changes
Fix typo
HDFFV-10328 merge allocation changes from 1.8
Fix some of the whitespace
Add note for plugins
Correct linkage of filters and other libs
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 91b8e0c..b163b8a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -883,7 +883,7 @@ set (gen_SRCS ${HDF5_BINARY_DIR}/H5Tinit.c ${HDF5_BINARY_DIR}/H5lib_settings.c) add_library (${HDF5_LIB_TARGET} STATIC ${common_SRCS} ${gen_SRCS} ${H5_PUBLIC_HEADERS} ${H5_PRIVATE_HEADERS} ${H5_GENERATED_HEADERS}) TARGET_C_PROPERTIES (${HDF5_LIB_TARGET} STATIC " " " ") -target_link_libraries (${HDF5_LIB_TARGET} PRIVATE ${LINK_LIBS}) +target_link_libraries (${HDF5_LIB_TARGET} PRIVATE ${LINK_LIBS} ${LINK_COMP_LIBS}) if (NOT WIN32) target_link_libraries (${HDF5_LIB_TARGET} PUBLIC dl) endif () @@ -927,7 +927,7 @@ if (BUILD_SHARED_LIBS) set (shared_gen_SRCS ${HDF5_BINARY_DIR}/shared/H5Tinit.c ${HDF5_BINARY_DIR}/shared/H5lib_settings.c) add_library (${HDF5_LIBSH_TARGET} SHARED ${common_SRCS} ${shared_gen_SRCS} ${H5_PUBLIC_HEADERS} ${H5_PRIVATE_HEADERS} ${H5_GENERATED_HEADERS}) TARGET_C_PROPERTIES (${HDF5_LIBSH_TARGET} SHARED " " " ") - target_link_libraries (${HDF5_LIBSH_TARGET} PRIVATE ${LINK_LIBS}) + target_link_libraries (${HDF5_LIBSH_TARGET} PRIVATE ${LINK_LIBS} ${LINK_COMP_LIBS}) if (NOT WIN32) target_link_libraries (${HDF5_LIBSH_TARGET} PUBLIC dl) endif () |