diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2017-02-01 20:52:44 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2017-02-01 20:52:44 (GMT) |
| commit | be955c5e792ff642c259c25999a86c6007682019 (patch) | |
| tree | 23b6dda252e605008b4c83ce4452453f1b9842da /tools/src/h5ls | |
| parent | c4142e07ddd04a97f1039900192bc18dca969dfc (diff) | |
| parent | 3c169f947382da170c8589f6c00896a9c4ea8e6c (diff) | |
| download | hdf5-be955c5e792ff642c259c25999a86c6007682019.zip hdf5-be955c5e792ff642c259c25999a86c6007682019.tar.gz hdf5-be955c5e792ff642c259c25999a86c6007682019.tar.bz2 | |
Merge pull request #277 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '3c169f947382da170c8589f6c00896a9c4ea8e6c':
HDFFV-10123 Use generator expression
HDFFV-10123 fix shared name
HDFFV-10123 Add SHARED tools
HDFFV-10046 add shared versions of tools for plugin filters
HDFFV-10046 build a shared version of h5repack tool for plugins
Diffstat (limited to 'tools/src/h5ls')
| -rw-r--r-- | tools/src/h5ls/CMakeLists.txt | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/tools/src/h5ls/CMakeLists.txt b/tools/src/h5ls/CMakeLists.txt index 1bc241a..b4e3633 100644 --- a/tools/src/h5ls/CMakeLists.txt +++ b/tools/src/h5ls/CMakeLists.txt @@ -16,9 +16,18 @@ target_link_libraries (h5ls ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET}) set_target_properties (h5ls PROPERTIES FOLDER tools) set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5ls") -set (H5_DEP_EXECUTABLES - h5ls -) +set (H5_DEP_EXECUTABLES h5ls) + +if (BUILD_SHARED_LIBS) + add_executable (h5ls-shared ${HDF5_TOOLS_SRC_H5LS_SOURCE_DIR}/h5ls.c) + TARGET_NAMING (h5ls-shared SHARED) + TARGET_C_PROPERTIES (h5ls-shared SHARED " " " ") + target_link_libraries (h5ls-shared ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET}) + set_target_properties (h5ls-shared PROPERTIES FOLDER tools) + set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5ls-shared") + + set (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES} h5ls-shared) +endif () ############################################################################## ############################################################################## @@ -30,11 +39,13 @@ set (H5_DEP_EXECUTABLES # Rules for Installation of tools using make Install target #----------------------------------------------------------------------------- -#INSTALL_PROGRAM_PDB (h5ls ${HDF5_INSTALL_BIN_DIR} toolsapplications) +if (BUILD_SHARED_LIBS) + INSTALL_PROGRAM_PDB (h5ls-shared ${HDF5_INSTALL_BIN_DIR} toolsapplications) +endif () install ( TARGETS - h5ls + ${H5_DEP_EXECUTABLES} EXPORT ${HDF5_EXPORTED_TARGETS} RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR} COMPONENT toolsapplications |