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 /src | |
| 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 'src')
| -rw-r--r-- | src/CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9fcb28d..75754fe 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -707,7 +707,7 @@ set_target_properties (${HDF5_LIB_TARGET} PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>" ) -option (HDF5_ENABLE_DEBUG_APIS "Turn on debugging in all packages" OFF) +option (HDF5_ENABLE_DEBUG_APIS "Turn on extra debug output in all packages" OFF) if (HDF5_ENABLE_DEBUG_APIS) set_target_properties (${HDF5_LIB_TARGET} PROPERTIES COMPILE_DEFINITIONS @@ -739,6 +739,7 @@ if (BUILD_SHARED_LIBS) APPEND PROPERTY COMPILE_DEFINITIONS "H5_HAVE_THREADSAFE" ) + target_link_libraries (${HDF5_LIBSH_TARGET} Threads::Threads) endif (HDF5_ENABLE_THREADSAFE) if (HDF5_ENABLE_DEBUG_APIS) @@ -781,5 +782,6 @@ if (HDF5_EXPORTED_TARGETS) ARCHIVE DESTINATION ${HDF5_INSTALL_LIB_DIR} COMPONENT libraries RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR} COMPONENT libraries FRAMEWORK DESTINATION ${HDF5_INSTALL_FWRK_DIR} COMPONENT libraries + INCLUDES DESTINATION include ) endif (HDF5_EXPORTED_TARGETS) |