diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2023-06-13 23:14:12 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-13 23:14:12 (GMT) |
| commit | 3d231bd0c018c4ac7a78640a51d404332a712d72 (patch) | |
| tree | fa3909104ef9fed8cb129fbec97a42c1e47daa37 /src | |
| parent | bfeb1b0dd5b7b2e4a706ff9b9515bba15e673f31 (diff) | |
| download | hdf5-3d231bd0c018c4ac7a78640a51d404332a712d72.zip hdf5-3d231bd0c018c4ac7a78640a51d404332a712d72.tar.gz hdf5-3d231bd0c018c4ac7a78640a51d404332a712d72.tar.bz2 | |
merges from develop (#3115)
* Fix release action that allows files to be uploaded.
* Add autotools h5copy help test.
* Update cmake tools.cmake file for clang-tidy.
* CMake build is missing H5FDsubfiling.h
* Correct snapshot location
* Add note for issue 3056
Diffstat (limited to 'src')
| -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 4edcc98..d85ac0f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1230,7 +1230,7 @@ if (BUILD_STATIC_LIBS) add_library (${HDF5_LIB_TARGET} STATIC ${common_SRCS} ${gen_SRCS} ${H5_PUBLIC_HEADERS} ${H5_PRIVATE_HEADERS} ${H5_GENERATED_HEADERS} ${H5_MODULE_HEADERS}) target_include_directories (${HDF5_LIB_TARGET} PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>" - INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>;$<BUILD_INTERFACE:${HDF5_SRC_BINARY_DIR}>" + INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>;$<BUILD_INTERFACE:${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR}>" ) target_compile_options(${HDF5_LIB_TARGET} PRIVATE "${HDF5_CMAKE_C_FLAGS}") target_compile_definitions(${HDF5_LIB_TARGET} @@ -1271,7 +1271,7 @@ if (BUILD_SHARED_LIBS) target_include_directories (${HDF5_LIBSH_TARGET} PRIVATE "${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>" PUBLIC "$<$<BOOL:${HDF5_ENABLE_HDFS}>:${HDFS_INCLUDE_DIR}>" - INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>;$<BUILD_INTERFACE:${HDF5_SRC_BINARY_DIR}>" + INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>;$<BUILD_INTERFACE:${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR}>" ) target_compile_options(${HDF5_LIBSH_TARGET} PRIVATE "${HDF5_CMAKE_C_FLAGS}") target_compile_definitions(${HDF5_LIBSH_TARGET} |