summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2019-01-09 19:18:52 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2019-01-09 19:18:52 (GMT)
commita043211d9edf2df3ea8049bda4be6bdcbf0970e9 (patch)
tree331b35e20517b928d21f52820cb8fec96c745973 /src
parentf12d2263d91881f9d23cd091ccf0a5462acfa0d6 (diff)
parent46f63b0faafe574ca2a32380ea85cac8206b1028 (diff)
downloadhdf5-a043211d9edf2df3ea8049bda4be6bdcbf0970e9.zip
hdf5-a043211d9edf2df3ea8049bda4be6bdcbf0970e9.tar.gz
hdf5-a043211d9edf2df3ea8049bda4be6bdcbf0970e9.tar.bz2
Merge pull request #1457 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '46f63b0faafe574ca2a32380ea85cac8206b1028': Fix deprecated H5Pget_version Fix java regex Merge CMake changes from develop
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt15
1 files changed, 15 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 47b4989..3b3459d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -907,6 +907,21 @@ if (BUILD_SHARED_LIBS)
file (MAKE_DIRECTORY "${HDF5_BINARY_DIR}/shared")
endif ()
+if (LOCAL_BATCH_TEST)
+ if (LOCAL_BATCH_SCRIPT_NAME)
+ configure_file (
+ ${HDF5_SOURCE_DIR}/bin/batch/${LOCAL_BATCH_SCRIPT_NAME}.in.cmake
+ ${HDF5_BINARY_DIR}/${LOCAL_BATCH_SCRIPT_NAME} ESCAPE_QUOTES @ONLY
+ )
+ endif ()
+ if (LOCAL_BATCH_SCRIPT_PARALLEL_NAME)
+ configure_file (
+ ${HDF5_SOURCE_DIR}/bin/batch/${LOCAL_BATCH_SCRIPT_PARALLEL_NAME}.in.cmake
+ ${HDF5_BINARY_DIR}/${LOCAL_BATCH_SCRIPT_PARALLEL_NAME} ESCAPE_QUOTES @ONLY
+ )
+ endif ()
+endif ()
+
if (NOT EXISTS ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c)
add_executable (H5detect ${HDF5_SRC_DIR}/H5detect.c)
target_include_directories(H5detect PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>")