diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2020-08-16 23:41:13 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2020-08-16 23:41:13 (GMT) |
| commit | 0d14414ddd860f24f1386771ed3ba8d2f5e2710d (patch) | |
| tree | 6d97246e6316ae12e3b5eee9b4e37dd552bd1b13 /utils | |
| parent | 24c23c79d85fd3df3cfbaad41af7d64bb14220ee (diff) | |
| download | hdf5-0d14414ddd860f24f1386771ed3ba8d2f5e2710d.zip hdf5-0d14414ddd860f24f1386771ed3ba8d2f5e2710d.tar.gz hdf5-0d14414ddd860f24f1386771ed3ba8d2f5e2710d.tar.bz2 | |
1. HDFFV-10830 part 2, move AC_CHECK_HEADERS([szlib.h] after
AC_CHECK_LIB([sz], [SZ_BufftoBuffCompress] to avoid compiling
H5Z.c with szlib.h after its path is removed from AM_CPPFLAGS.
2. Remove unnecessary links to ${HDF5_TOOLS_LIB_TARGET} in
utils/mirror_vfd/CMakeLists.txt that prevent building HDF5 with tools
disabled.
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/mirror_vfd/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/utils/mirror_vfd/CMakeLists.txt b/utils/mirror_vfd/CMakeLists.txt index 1926352..6137e82 100644 --- a/utils/mirror_vfd/CMakeLists.txt +++ b/utils/mirror_vfd/CMakeLists.txt @@ -13,10 +13,10 @@ add_executable (mirror_server ${mirror_server_SOURCES}) target_include_directories (mirror_server PRIVATE "${HDF5_UITLS_DIR};${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>") if (NOT BUILD_SHARED_LIBS) TARGET_C_PROPERTIES (mirror_server STATIC) - target_link_libraries (mirror_server PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET}) + target_link_libraries (mirror_server PRIVATE ${HDF5_LIB_TARGET}) else () TARGET_C_PROPERTIES (mirror_server SHARED) - target_link_libraries (mirror_server PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET}) + target_link_libraries (mirror_server PRIVATE ${HDF5_LIBSH_TARGET}) endif () set_target_properties (mirror_server PROPERTIES FOLDER utils) set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};mirror_server") @@ -31,10 +31,10 @@ add_executable (mirror_server_stop ${mirror_server_stop_SOURCES}) target_include_directories (mirror_server_stop PRIVATE "${HDF5_UITLS_DIR};${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>") if (NOT BUILD_SHARED_LIBS) TARGET_C_PROPERTIES (mirror_server_stop STATIC) - target_link_libraries (mirror_server_stop PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET}) + target_link_libraries (mirror_server_stop PRIVATE ${HDF5_LIB_TARGET}) else () TARGET_C_PROPERTIES (mirror_server_stop SHARED) - target_link_libraries (mirror_server_stop PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET}) + target_link_libraries (mirror_server_stop PRIVATE ${HDF5_LIBSH_TARGET}) endif () set_target_properties (mirror_server_stop PROPERTIES FOLDER utils) set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};mirror_server_stop") |