From e5c5ec03b6b81317d83a33dd9723f1468400c677 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Wed, 16 Dec 2020 11:06:54 -0600
Subject: [PATCH 1/2] Correct fortran and shared libs option

---
 fortran/examples/CMakeLists.txt | 2 +-
 hl/fortran/src/CMakeLists.txt   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fortran/examples/CMakeLists.txt b/fortran/examples/CMakeLists.txt
index 610ee8c698a..2092dbea1ac 100644
--- a/fortran/examples/CMakeLists.txt
+++ b/fortran/examples/CMakeLists.txt
@@ -41,7 +41,7 @@ foreach (example ${examples})
   if(MSVC)
     set_property(TARGET f90_ex_${example} PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE ${WIN_LINK_FLAGS}")
   endif()
-  if (NOT BUILD_SHARED_LIBS)
+  if (NOT ONLY_SHARED_LIBS)
     target_include_directories (f90_ex_${example}
         PRIVATE
             "${CMAKE_Fortran_MODULE_DIRECTORY}/static"
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt
index dc5803b5158..edde8310df8 100644
--- a/hl/fortran/src/CMakeLists.txt
+++ b/hl/fortran/src/CMakeLists.txt
@@ -245,8 +245,8 @@ if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED)
   set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_F90_LIB_CORENAME}")
 endif ()
 
-set (_PKG_CONFIG_REQUIRES "${HDF5_F90_LIB_CORENAME}")
-set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_F90_LIB_CORENAME}")
+set (_PKG_CONFIG_REQUIRES "${HDF5_HL_LIB_CORENAME}")
+set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_HL_LIB_CORENAME}")
 
 configure_file (
     ${HDF_RESOURCES_DIR}/libhdf5.pc.in

From 5709b39cd08ae4b0eab2d8883a5cd03a220e30a5 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Wed, 16 Dec 2020 11:23:10 -0600
Subject: [PATCH 2/2] Fix for no shared fortran build

---
 fortran/test/CMakeLists.txt    | 2 +-
 fortran/testpar/CMakeLists.txt | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fortran/test/CMakeLists.txt b/fortran/test/CMakeLists.txt
index 10fb66d2886..6a4bef110ac 100644
--- a/fortran/test/CMakeLists.txt
+++ b/fortran/test/CMakeLists.txt
@@ -57,7 +57,7 @@ endif ()
 # Add Target to clang-format
 #-----------------------------------------------------------------------------
 if (HDF5_ENABLE_FORMATTERS)
-  if (NOT BUILD_SHARED_LIBS)
+  if (NOT ONLY_SHARED_LIBS)
     clang_format (HDF5_FORTRAN_TESTS_FORMAT ${HDF5_F90_C_TEST_LIB_TARGET})
   else ()
     clang_format (HDF5_FORTRAN_TESTS_FORMAT ${HDF5_F90_C_TEST_LIBSH_TARGET})
diff --git a/fortran/testpar/CMakeLists.txt b/fortran/testpar/CMakeLists.txt
index 12489528ff9..e527f981e94 100644
--- a/fortran/testpar/CMakeLists.txt
+++ b/fortran/testpar/CMakeLists.txt
@@ -5,7 +5,7 @@ project (HDF5_FORTRAN_TESTPAR C Fortran)
 # Setup include Directories
 #-----------------------------------------------------------------------------
 set (TESTPAR_INCLUDES ${MPI_Fortran_INCLUDE_DIRS} ${HDF5_F90_BINARY_DIR} ${HDF5_F90_SRC_DIR}/src))
-if (NOT BUILD_SHARED_LIBS)
+if (NOT ONLY_SHARED_LIBS)
   set (TESTPAR_INCLUDES ${TESTPAR_INCLUDES} ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
 else ()
   set (TESTPAR_INCLUDES ${TESTPAR_INCLUDES} ${CMAKE_Fortran_MODULE_DIRECTORY}/shared)
@@ -29,7 +29,7 @@ target_compile_options(parallel_test
         "${HDF5_CMAKE_Fortran_FLAGS}"
         $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}>
 )
-if (NOT BUILD_SHARED_LIBS)
+if (NOT ONLY_SHARED_LIBS)
   target_link_libraries (parallel_test
       PRIVATE
           ${HDF5_F90_TEST_LIB_TARGET} ${HDF5_F90_LIB_TARGET} ${HDF5_LIB_TARGET} ${LINK_Fortran_LIBS}