diff options
| author | Vailin Choi <vchoi@hdfgroup.org> | 2016-10-17 16:53:45 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@hdfgroup.org> | 2016-10-17 16:53:45 (GMT) |
| commit | 36a85b7325767fe5de15d98419303807eb539c15 (patch) | |
| tree | e69e3c6418447af97519e56e4054387e9eda7c1b /tools/h5copy | |
| parent | 48990d1a91ba6d753d7321e3e348d24fde3669ce (diff) | |
| parent | 394c6b8c3a4c781c1ee877f969a146cece3d7831 (diff) | |
| download | hdf5-36a85b7325767fe5de15d98419303807eb539c15.zip hdf5-36a85b7325767fe5de15d98419303807eb539c15.tar.gz hdf5-36a85b7325767fe5de15d98419303807eb539c15.tar.bz2 | |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_8)
* commit '394c6b8c3a4c781c1ee877f969a146cece3d7831':
Add missing EXPORT tag in install command
Fix typo and remove test only tools from exports
Add namespace and export utils
HDFFV-9961: Merge GIT ext lib option to 1.8
Diffstat (limited to 'tools/h5copy')
| -rw-r--r-- | tools/h5copy/CMakeLists.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/h5copy/CMakeLists.txt b/tools/h5copy/CMakeLists.txt index 63b9b5d..23db8bb 100644 --- a/tools/h5copy/CMakeLists.txt +++ b/tools/h5copy/CMakeLists.txt @@ -14,6 +14,7 @@ TARGET_NAMING (h5copy STATIC) TARGET_C_PROPERTIES (h5copy STATIC " " " ") target_link_libraries (h5copy ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET}) set_target_properties (h5copy PROPERTIES FOLDER tools) +set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5copy") set (H5_DEP_EXECUTABLES h5copy) @@ -42,9 +43,11 @@ endif (BUILD_TESTING) #----------------------------------------------------------------------------- #INSTALL_PROGRAM_PDB (h5copy ${HDF5_INSTALL_BIN_DIR} toolsapplications) - + install ( TARGETS h5copy + EXPORT + ${HDF5_EXPORTED_TARGETS} RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR} COMPONENT toolsapplications ) |