summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAllen Byrne <50328838+byrnHDF@users.noreply.github.com>2021-02-04 14:20:25 (GMT)
committerGitHub <noreply@github.com>2021-02-04 14:20:25 (GMT)
commit8cfcf0e3949c2de67f6fb29dd52d5bc57b76ba0d (patch)
treeb4882b25a68ac0d80a32252dfad5b905e9bcc5fd /src
parent674e1f02a3ac37cf3d57df1aee902b7af44f398e (diff)
downloadhdf5-8cfcf0e3949c2de67f6fb29dd52d5bc57b76ba0d.zip
hdf5-8cfcf0e3949c2de67f6fb29dd52d5bc57b76ba0d.tar.gz
hdf5-8cfcf0e3949c2de67f6fb29dd52d5bc57b76ba0d.tar.bz2
1 10 merges from develop (#298)
* HDFFV-10865 - merge from dev, HDFArray perf fix. * Remove duplicate setting * Whitespace changes after clang format * Undo version 11 clang format changes * Merge CMake changes from develop * test testing script merge from develop * Update supported platforms
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cbf3e66..329a2dc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -420,6 +420,7 @@ set (H5MP_HDRS
)
IDE_GENERATED_PROPERTIES ("H5MP" "${H5MP_HDRS}" "${H5MP_SOURCES}" )
+
set (H5O_SOURCES
${HDF5_SRC_DIR}/H5O.c
${HDF5_SRC_DIR}/H5Oainfo.c
@@ -938,7 +939,7 @@ if (HDF5_GENERATE_HEADERS)
)
message(STATUS ${SCRIPT_OUTPUT})
else ()
- message (STATUS "Cannot generate headers - perl not found")
+ message (WARNING "Cannot generate headers - perl not found")
endif ()
endif ()
@@ -1056,7 +1057,8 @@ else ()
)
if (BUILD_SHARED_LIBS)
add_custom_command (
- OUTPUT ${HDF5_GENERATED_SOURCE_DIR}/shared/shared_gen_SRCS.stamp1
+ OUTPUT ${HDF5_GENERATED_SOURCE_DIR}/shared/H5Tinit.c
+ ${HDF5_GENERATED_SOURCE_DIR}/shared/shared_gen_SRCS.stamp1
COMMAND ${CMAKE_COMMAND}
ARGS -E copy_if_different "${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c" "${HDF5_GENERATED_SOURCE_DIR}/shared/H5Tinit.c"
COMMAND ${CMAKE_COMMAND}
@@ -1269,7 +1271,7 @@ set (_PKG_CONFIG_REQUIRES)
set (_PKG_CONFIG_REQUIRES_PRIVATE)
configure_file (
- ${HDF_RESOURCES_DIR}/libhdf5.pc.in
+ ${HDF_CONFIG_DIR}/libhdf5.pc.in
${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}.pc
@ONLY
)