From 72124031ec497c0bccf5b9f89dc500a266e21dcf Mon Sep 17 00:00:00 2001
From: Larry Knox <lrknox@hdfgroup.org>
Date: Mon, 31 Dec 2018 09:20:27 -0600
Subject: Add libhdf5_hl_fortran symlinks for libhdf5hl_fortran files. Set
 ctest*.lsf.in.cmake scripts for sierra. Correct src/CMakelists.txt syntax
 error.

---
 bin/batch/ctestP.lsf.in.cmake |  2 +-
 bin/batch/ctestS.lsf.in.cmake |  2 +-
 hl/fortran/Makefile.am        | 12 ++++++++++++
 src/CMakeLists.txt            | 22 ++++++++++++----------
 4 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/bin/batch/ctestP.lsf.in.cmake b/bin/batch/ctestP.lsf.in.cmake
index c410a1d..2777f39 100644
--- a/bin/batch/ctestP.lsf.in.cmake
+++ b/bin/batch/ctestP.lsf.in.cmake
@@ -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
diff --git a/bin/batch/ctestS.lsf.in.cmake b/bin/batch/ctestS.lsf.in.cmake
index a6f4ff8..5692574 100644
--- a/bin/batch/ctestS.lsf.in.cmake
+++ b/bin/batch/ctestS.lsf.in.cmake
@@ -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
diff --git a/hl/fortran/Makefile.am b/hl/fortran/Makefile.am
index ad18a21..14456fe 100644
--- a/hl/fortran/Makefile.am
+++ b/hl/fortran/Makefile.am
@@ -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;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 61cc05a..96cf7ab 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -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)
-- 
cgit v0.12