diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2019-01-08 03:01:06 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2019-01-08 03:01:06 (GMT) |
| commit | 74a41f92a48d553a33b80d84d0981623327074af (patch) | |
| tree | c952c99eed26f4a3d1fc8443d9b505a938884e29 /src | |
| parent | 9c12b625fd092bc3e87eb21f1fa554951ff4bdd8 (diff) | |
| parent | e27df5a5fe365480b0809ce523b0e9cd1096a43d (diff) | |
| download | hdf5-74a41f92a48d553a33b80d84d0981623327074af.zip hdf5-74a41f92a48d553a33b80d84d0981623327074af.tar.gz hdf5-74a41f92a48d553a33b80d84d0981623327074af.tar.bz2 | |
Merge pull request #1443 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit 'e27df5a5fe365480b0809ce523b0e9cd1096a43d':
Add variables to set up module switch between configure and build for cross compiling on CrayXC40.
Remove install-exec-hook from hl/fortran/Makefile.am. Add check for existing links in hl/fortran/src/Makefile.am.
Configure build directory in batch scripts.
Add libhdf5_hl_fortran symlinks for libhdf5hl_fortran files. Set ctest*.lsf.in.cmake scripts for sierra. Correct src/CMakelists.txt syntax error.
Correct syntax error in CMakeLists.txt.
Add .lsf batch scripts and insert the build directory into the scripts during configuration.
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 40b64f5..ff7402b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -943,6 +943,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}>") |