mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-04-12 17:31:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add libhdf5_hl_fortran symlinks for libhdf5hl_fortran files.

Browse Source 
Set ctest*.lsf.in.cmake scripts for sierra.
Correct src/CMakelists.txt syntax error.
This commit is contained in:
Larry Knox 2018-12-31 09:20:27 -06:00
parent 715272eeb7
commit 72124031ec
4 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/batch/ctestP.lsf.in.cmake
View File

@ -1,6 +1,6 @@
#!/bin/tcsh
### LSF syntax
#BSUB -n 1 #number of nodes
#BSUB -nnodes 1 #number of nodes
#BSUB -W 30 #walltime in minutes
#BSUB -G guests #account
#BSUB -e ctestPerrors.txt #stderr

2
bin/batch/ctestS.lsf.in.cmake
View File

@ -1,6 +1,6 @@
#!/bin/tcsh
### LSF syntax
#BSUB -n 1 #number of nodes
#BSUB -nnodes 1 #number of nodes
#BSUB -W 29 #walltime in minutes
#BSUB -G guests #account
#BSUB -e ctestSerrors.txt #stderr

12
hl/fortran/Makefile.am
View File

@ -26,6 +26,18 @@ include $(top_srcdir)/config/commence.am
SUBDIRS=src test
DIST_SUBDIRS=src test examples
# The name of the lib file doesn't follow the same pattern as the other hl lib
# files, namely libhdf5_hl_*. Add a symlink with the compliant name to the
# actual lib file.
install-exec-hook:
cd $(DESTDIR)$(libdir) && \
if test -f libhdf5hl_fortran.a; then \
$(LN_S) libhdf5hl_fortran.a libhdf5_hl_fortran.a; \
fi; \
if test -f libhdf5hl_fortran.so; then \
$(LN_S) libhdf5hl_fortran.so libhdf5_hl_fortran.so; \
fi;
# Install examples
install-examples uninstall-examples:
@(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;

22
src/CMakeLists.txt
View File

@ -943,17 +943,19 @@ if (BUILD_SHARED_LIBS)
file (MAKE_DIRECTORY "${HDF5_BINARY_DIR}/shared")
endif ()
# This should perhaps be some kind of foreach or for loop for all of the files in the bin/batch directory.
# For today I'll do it for the two that I want to try.
if (LOCAL_BATCH_TEST)
configure_file (
${HDF5_SOURCE_DIR}/bin/batch/ctestP.lsf.in.cmake
${HDF5_SOURCE_DIR}/bin/batch ESCAPE_QUOTES @ONLY
)
configure_file (
${HDF5_SOURCE_DIR}/bin/batch/ctestS.lsf.in.cmake
${HDF5_SOURCE_DIR}/bin/batch ESCAPE_QUOTES @ONLY
)
if (LOCAL_BATCH_SCRIPT_NAME)
configure_file (
${HDF5_SOURCE_DIR}/bin/batch/${LOCAL_BATCH_SCRIPT_NAME}.in.cmake
${HDF5_SOURCE_DIR}/bin/batch/${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_SOURCE_DIR}/bin/batch/${LOCAL_BATCH_SCRIPT_PARALLEL_NAME} ESCAPE_QUOTES @ONLY
)
endif ()
endif ()
if (NOT EXISTS ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c)