[svn-r27465] Merge dual-binary CMake changes

6 files changed, 438 insertions, 86 deletions

diff --git a/fortran/examples/CMakeLists.txt b/fortran/examples/CMakeLists.txt
index 2bf0bf6..fabc5cd 100644
--- a/fortran/examples/CMakeLists.txt
+++ b/fortran/examples/CMakeLists.txt
@@ -40,8 +40,8 @@ set (F2003_examples
 
 foreach (example ${examples})
   add_executable (f90_ex_${example} ${HDF5_F90_EXAMPLES_SOURCE_DIR}/${example}.f90)
-  TARGET_NAMING (f90_ex_${example} ${LIB_TYPE})
-  TARGET_FORTRAN_PROPERTIES (f90_ex_${example} ${LIB_TYPE} " " " ")
+  TARGET_NAMING (f90_ex_${example} STATIC)
+  TARGET_FORTRAN_PROPERTIES (f90_ex_${example} STATIC " " " ")
   target_link_libraries (f90_ex_${example}
       ${HDF5_F90_LIB_TARGET}
       ${HDF5_LIB_TARGET}
@@ -50,15 +50,30 @@ foreach (example ${examples})
   set_target_properties (f90_ex_${example} PROPERTIES
       LINKER_LANGUAGE Fortran
       FOLDER examples/fortran
-      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}
+      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
   )
+  if (BUILD_SHARED_LIBS)
+    add_executable (f90_ex_${example}-shared ${HDF5_F90_EXAMPLES_SOURCE_DIR}/${example}.f90)
+    TARGET_NAMING (f90_ex_${example}-shared SHARED)
+    TARGET_FORTRAN_PROPERTIES (f90_ex_${example}-shared SHARED " " " ")
+    target_link_libraries (f90_ex_${example}-shared
+        ${HDF5_F90_LIBSH_TARGET}
+        ${HDF5_LIBSH_TARGET}
+    )
+    target_include_directories (f90_ex_${example}-shared PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/shared)
+    set_target_properties (f90_ex_${example}-shared PROPERTIES
+        LINKER_LANGUAGE Fortran
+        FOLDER examples/fortran
+        Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/shared
+    )
+  endif (BUILD_SHARED_LIBS)
 endforeach (example ${examples})
 
 if (HDF5_ENABLE_F2003)
   foreach (example ${F2003_examples})
     add_executable (f03_ex_${example} ${HDF5_F90_EXAMPLES_SOURCE_DIR}/${example}.f90)
-    TARGET_NAMING (f03_ex_${example} ${LIB_TYPE})
-    TARGET_FORTRAN_PROPERTIES (f03_ex_${example} ${LIB_TYPE} " " " ")
+    TARGET_NAMING (f03_ex_${example} STATIC)
+    TARGET_FORTRAN_PROPERTIES (f03_ex_${example} STATIC " " " ")
     target_link_libraries (f03_ex_${example}
         ${HDF5_F90_LIB_TARGET}
         ${HDF5_LIB_TARGET}
@@ -67,15 +82,30 @@ if (HDF5_ENABLE_F2003)
     set_target_properties (f03_ex_${example} PROPERTIES
         LINKER_LANGUAGE Fortran
         FOLDER examples/fortran03
-        Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}
+        Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
     )
+    if (BUILD_SHARED_LIBS)
+      add_executable (f03_ex_${example}-shared ${HDF5_F90_EXAMPLES_SOURCE_DIR}/${example}.f90)
+      TARGET_NAMING (f03_ex_${example}-shared SHARED)
+      TARGET_FORTRAN_PROPERTIES (f03_ex_${example}-shared SHARED " " " ")
+      target_link_libraries (f03_ex_${example}-shared
+          ${HDF5_F90_LIBSH_TARGET}
+          ${HDF5_LIBSH_TARGET}
+      )
+      target_include_directories (f03_ex_${example}-shared PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/shared)
+      set_target_properties (f03_ex_${example}-shared PROPERTIES
+          LINKER_LANGUAGE Fortran
+          FOLDER examples/fortran03
+          Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/shared
+      )
+    endif (BUILD_SHARED_LIBS)
   endforeach (example ${F2003_examples})
 endif (HDF5_ENABLE_F2003)
 
 if (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)
   add_executable (f90_ex_ph5example ${HDF5_F90_EXAMPLES_SOURCE_DIR}/ph5example.f90)
-  TARGET_NAMING (f90_ex_ph5example ${LIB_TYPE})
-  TARGET_FORTRAN_PROPERTIES (f90_ex_ph5example ${LIB_TYPE} " " " ")
+  TARGET_NAMING (f90_ex_ph5example STATIC)
+  TARGET_FORTRAN_PROPERTIES (f90_ex_ph5example STATIC " " " ")
   target_link_libraries (f90_ex_ph5example
       ${HDF5_F90_LIB_TARGET}
       ${HDF5_LIB_TARGET}
@@ -85,8 +115,24 @@ if (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)
   set_target_properties (f90_ex_ph5example PROPERTIES
       LINKER_LANGUAGE Fortran
       FOLDER examples/fortran
-      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}
+      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
   )
+  if (BUILD_SHARED_LIBS)
+    add_executable (f90_ex_ph5example-shared ${HDF5_F90_EXAMPLES_SOURCE_DIR}/ph5example.f90)
+    TARGET_NAMING (f90_ex_ph5example-shared SHARED)
+    TARGET_FORTRAN_PROPERTIES (f90_ex_ph5example-shared SHARED " " " ")
+    target_link_libraries (f90_ex_ph5example-shared
+        ${HDF5_F90_LIBSH_TARGET}
+        ${HDF5_LIBSH_TARGET}
+        ${MPI_Fortran_LIBRARIES}
+    )
+    target_include_directories (f90_ex_ph5example-shared PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/shared)
+    set_target_properties (f90_ex_ph5example-shared PROPERTIES
+        LINKER_LANGUAGE Fortran
+        FOLDER examples/fortran
+        Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/shared
+    )
+  endif (BUILD_SHARED_LIBS)
 endif (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)
 
 if (BUILD_TESTING)
diff --git a/fortran/examples/CMakeTests.cmake b/fortran/examples/CMakeTests.cmake
index 57aec53..173984c 100644
--- a/fortran/examples/CMakeTests.cmake
+++ b/fortran/examples/CMakeTests.cmake
@@ -28,6 +28,30 @@
     set_tests_properties (f90_ex-clear-objects PROPERTIES DEPENDS ${last_test})
   endif (NOT "${last_test}" STREQUAL "")
   set (last_test "f90_ex-clear-objects")
+  if (BUILD_SHARED_LIBS)
+    add_test (
+        NAME f90_ex-shared-clear-objects
+        COMMAND    ${CMAKE_COMMAND}
+            -E remove 
+            compound.h5
+            copy1.h5
+            copy2.h5
+            dsetf.h5
+            extend.h5 
+            FORTRAN.h5
+            groupf.h5
+            groupsf.h5
+            h5_cmprss.h5
+            mount1.h5
+            mount2.h5
+            sdsf.h5
+            subset.h5
+    )
+    if (NOT "${last_test}" STREQUAL "")
+      set_tests_properties (f90_ex-shared-clear-objects PROPERTIES DEPENDS ${last_test})
+    endif (NOT "${last_test}" STREQUAL "")
+    set (last_test "f90_ex-shared-clear-objects")
+  endif (BUILD_SHARED_LIBS)
 
 foreach (example ${examples})
   add_test (NAME f90_ex_${example} COMMAND $<TARGET_FILE:f90_ex_${example}>)
@@ -35,6 +59,13 @@ foreach (example ${examples})
     set_tests_properties (f90_ex_${example} PROPERTIES DEPENDS ${last_test})
   endif (NOT "${last_test}" STREQUAL "")
   set (last_test "f90_ex_${example}")
+  if (BUILD_SHARED_LIBS)
+    add_test (NAME f90_ex-shared_${example} COMMAND $<TARGET_FILE:f90_ex_${example}-shared>)
+    if (NOT "${last_test}" STREQUAL "")
+      set_tests_properties (f90_ex-shared_${example} PROPERTIES DEPENDS ${last_test})
+    endif (NOT "${last_test}" STREQUAL "")
+    set (last_test "f90_ex-shared_${example}")
+  endif (BUILD_SHARED_LIBS)
 endforeach (example ${examples})
 
 if (HDF5_ENABLE_F2003)
@@ -44,9 +75,19 @@ if (HDF5_ENABLE_F2003)
       set_tests_properties (f03_ex_${example} PROPERTIES DEPENDS ${last_test})
     endif (NOT "${last_test}" STREQUAL "")
     set (last_test "f03_ex_${example}")
+    if (BUILD_SHARED_LIBS)
+      add_test (NAME f03_ex-shared_${example} COMMAND $<TARGET_FILE:f03_ex_${example}-shared>)
+      if (NOT "${last_test}" STREQUAL "")
+        set_tests_properties (f03_ex-shared_${example} PROPERTIES DEPENDS ${last_test})
+      endif (NOT "${last_test}" STREQUAL "")
+      set (last_test "f03_ex-shared_${example}")
+    endif (BUILD_SHARED_LIBS)
   endforeach (example ${F2003_examples})
 endif (HDF5_ENABLE_F2003)
 
 if (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)
   add_test (NAME f90_ex_ph5example COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:f90_ex_ph5example>)
+  if (BUILD_SHARED_LIBS)
+    add_test (NAME f90_ex-shared_ph5example COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:f90_ex_ph5example>)
+  endif (BUILD_SHARED_LIBS)
 endif (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt
index 0469aac..bb171d4 100644
--- a/fortran/src/CMakeLists.txt
+++ b/fortran/src/CMakeLists.txt
@@ -29,22 +29,37 @@ if (FORTRAN_HAVE_STORAGE_SIZE)
   add_executable (H5test_FortranHavekind
       ${HDF5_F90_SRC_SOURCE_DIR}/H5test_kind_STORAGE_SIZE.f90
   )
+  if (BUILD_SHARED_LIBS)
+    add_executable (H5test_FortranHavekind-shared
+        ${HDF5_F90_SRC_SOURCE_DIR}/H5test_kind_STORAGE_SIZE.f90
+    )
+  endif (BUILD_SHARED_LIBS)
   set (H5_TEST_KIND_NAME "h5test_kind_storage_size_mod")
 else (FORTRAN_HAVE_STORAGE_SIZE)
     if (FORTRAN_HAVE_SIZEOF)
       add_executable (H5test_FortranHavekind
           ${HDF5_F90_SRC_SOURCE_DIR}/H5test_kind_SIZEOF.f90
       )
+      if (BUILD_SHARED_LIBS)
+        add_executable (H5test_FortranHavekind-shared
+            ${HDF5_F90_SRC_SOURCE_DIR}/H5test_kind_SIZEOF.f90
+        )
+      endif (BUILD_SHARED_LIBS)
       set (H5_TEST_KIND_NAME "h5test_kind_sizeof_mod")
     else (FORTRAN_HAVE_SIZEOF)
       add_executable (H5test_FortranHavekind
           ${HDF5_F90_SRC_SOURCE_DIR}/H5test_kind.f90
       )
+      if (BUILD_SHARED_LIBS)
+        add_executable (H5test_FortranHavekind-shared
+            ${HDF5_F90_SRC_SOURCE_DIR}/H5test_kind.f90
+        )
+      endif (BUILD_SHARED_LIBS)
     endif (FORTRAN_HAVE_SIZEOF)
 endif (FORTRAN_HAVE_STORAGE_SIZE)
 if (WIN32 AND MSVC)
   if (BUILD_SHARED_LIBS)
-    set_target_properties (H5test_FortranHavekind
+    set_target_properties (H5test_FortranHavekind-shared
         PROPERTIES
             COMPILE_FLAGS "/MT"
     )
@@ -56,8 +71,14 @@ if (WIN32 AND MSVC)
 endif (WIN32 AND MSVC)
 set_target_properties (H5test_FortranHavekind PROPERTIES
     LINKER_LANGUAGE Fortran
-    Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}
+    Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
 )
+if (BUILD_SHARED_LIBS)
+  set_target_properties (H5test_FortranHavekind-shared PROPERTIES
+      LINKER_LANGUAGE Fortran
+      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/shared
+  )
+endif (BUILD_SHARED_LIBS)
 
 set (CMD $<TARGET_FILE:H5test_FortranHavekind>)
 add_custom_command (
@@ -144,16 +165,33 @@ set (f90CStub_C_HDRS
     ${HDF5_F90_BINARY_DIR}/H5f90i_gen.h
 )
 
-add_library (${HDF5_F90_C_LIB_TARGET} ${LIB_TYPE} ${f90CStub_C_SRCS} ${f90CStub_C_HDRS})
-TARGET_C_PROPERTIES (${HDF5_F90_C_LIB_TARGET} ${LIB_TYPE} " " " ")
+add_library (${HDF5_F90_C_LIB_TARGET} STATIC ${f90CStub_C_SRCS} ${f90CStub_C_HDRS})
+TARGET_C_PROPERTIES (${HDF5_F90_C_LIB_TARGET} STATIC " " " ")
 target_link_libraries (${HDF5_F90_C_LIB_TARGET} ${HDF5_LIB_TARGET} ${LINK_LIBS})
 set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_F90_C_LIB_TARGET}")
-H5_SET_LIB_OPTIONS (${HDF5_F90_C_LIB_TARGET} ${HDF5_F90_C_LIB_NAME} ${LIB_TYPE})
+H5_SET_LIB_OPTIONS (${HDF5_F90_C_LIB_TARGET} ${HDF5_F90_C_LIB_NAME} STATIC)
 set_target_properties (${HDF5_F90_C_LIB_TARGET} PROPERTIES
     FOLDER libraries/fortran
     LINKER_LANGUAGE C
     INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
 )
+set (install_targets ${HDF5_F90_C_LIB_TARGET})
+
+if (BUILD_SHARED_LIBS)
+  add_library (${HDF5_F90_C_LIBSH_TARGET} SHARED ${f90CStub_C_SRCS} ${f90CStub_C_HDRS})
+  TARGET_C_PROPERTIES (${HDF5_F90_C_LIBSH_TARGET} SHARED " " " ")
+  target_link_libraries (${HDF5_F90_C_LIBSH_TARGET} ${HDF5_LIBSH_TARGET} ${LINK_SHARED_LIBS})
+  set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_F90_C_LIBSH_TARGET}")
+  H5_SET_LIB_OPTIONS (${HDF5_F90_C_LIBSH_TARGET} ${HDF5_F90_C_LIB_NAME} SHARED)
+  set_target_properties (${HDF5_F90_C_LIBSH_TARGET} PROPERTIES
+      FOLDER libraries/fortran
+      LINKER_LANGUAGE C
+      COMPILE_DEFINITIONS "H5_BUILT_AS_DYNAMIC_LIB"
+      INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
+      INTERFACE_COMPILE_DEFINITIONS H5_BUILT_AS_DYNAMIC_LIB=1
+  )
+  set (install_targets ${install_targets} ${HDF5_F90_C_LIBSH_TARGET})
+endif (BUILD_SHARED_LIBS)
 
 #-----------------------------------------------------------------------------
 # Fortran 2003 standard
@@ -233,58 +271,86 @@ set_source_files_properties (${f90_F_SRCS} PROPERTIES LANGUAGE Fortran)
 #-----------------------------------------------------------------------------
 # Add Main fortran library
 #-----------------------------------------------------------------------------
-add_library (${HDF5_F90_LIB_TARGET} ${LIB_TYPE} ${f90_F_SRCS})
+add_library (${HDF5_F90_LIB_TARGET} STATIC ${f90_F_SRCS})
 set (SHARED_LINK_FLAGS " ")
-if (WIN32)
-  if (BUILD_SHARED_LIBS)
-    set_property (TARGET ${HDF5_F90_LIB_TARGET}
-      APPEND PROPERTY COMPILE_DEFINITIONS
-        BUILD_HDF5_DLL
-    )
-    if (MSVC)
-      set (SHARED_LINK_FLAGS "/DLL /DEF:${HDF5_F90_SRC_BINARY_DIR}/hdf5_fortrandll.def")
-    endif (MSVC)
-  endif (BUILD_SHARED_LIBS)
-  set_property (TARGET ${HDF5_F90_LIB_TARGET}
-      APPEND PROPERTY COMPILE_DEFINITIONS
-        HDF5F90_WINDOWS
-  )
-endif (WIN32)
-TARGET_FORTRAN_PROPERTIES (${HDF5_F90_LIB_TARGET} ${LIB_TYPE} " " ${SHARED_LINK_FLAGS})
+TARGET_FORTRAN_PROPERTIES (${HDF5_F90_LIB_TARGET} STATIC " " " ")
 target_link_libraries (${HDF5_F90_LIB_TARGET} ${HDF5_F90_C_LIB_TARGET} ${HDF5_LIB_TARGET})
 if (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)
   target_link_libraries (${HDF5_F90_LIB_TARGET} ${MPI_Fortran_LIBRARIES})
 endif (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)
 set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_F90_LIB_TARGET}")
-H5_SET_LIB_OPTIONS (${HDF5_F90_LIB_TARGET} ${HDF5_F90_LIB_NAME} ${LIB_TYPE})
+H5_SET_LIB_OPTIONS (${HDF5_F90_LIB_TARGET} ${HDF5_F90_LIB_NAME} STATIC)
 set_target_properties (${HDF5_F90_LIB_TARGET} PROPERTIES
     FOLDER libraries/fortran
     LINKER_LANGUAGE Fortran
     INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
-    Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}
+    Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
 )
+if (WIN32)
+  set_property (TARGET ${HDF5_F90_LIB_TARGET}
+      APPEND PROPERTY COMPILE_DEFINITIONS "HDF5F90_WINDOWS"
+  )
+endif (WIN32)
+set (install_targets ${install_targets} ${HDF5_F90_LIB_TARGET})
+
+if (BUILD_SHARED_LIBS)
+  add_library (${HDF5_F90_LIBSH_TARGET} SHARED ${f90_F_SRCS})
+  set (SHARED_LINK_FLAGS " ")
+  if (WIN32 AND MSVC)
+    set (SHARED_LINK_FLAGS "/DLL /DEF:${HDF5_F90_SRC_BINARY_DIR}/hdf5_fortrandll.def")
+  endif (WIN32 AND MSVC)
+  TARGET_FORTRAN_PROPERTIES (${HDF5_F90_LIBSH_TARGET} SHARED " " ${SHARED_LINK_FLAGS})
+  target_link_libraries (${HDF5_F90_LIBSH_TARGET} ${HDF5_F90_C_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
+  if (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)
+    target_link_libraries (${HDF5_F90_LIBSH_TARGET} ${MPI_Fortran_LIBRARIES})
+  endif (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)
+  set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_F90_LIBSH_TARGET}")
+  H5_SET_LIB_OPTIONS (${HDF5_F90_LIBSH_TARGET} ${HDF5_F90_LIB_NAME} SHARED)
+  set_target_properties (${HDF5_F90_LIBSH_TARGET} PROPERTIES
+      FOLDER libraries/fortran
+      LINKER_LANGUAGE Fortran
+      COMPILE_DEFINITIONS "H5_BUILT_AS_DYNAMIC_LIB"
+      INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
+      INTERFACE_COMPILE_DEFINITIONS H5_BUILT_AS_DYNAMIC_LIB=1
+      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/shared
+  )
+  if (WIN32)
+    set_property (TARGET ${HDF5_F90_LIBSH_TARGET}
+      APPEND PROPERTY COMPILE_DEFINITIONS "BUILD_HDF5_DLL;HDF5F90_WINDOWS"
+    )
+  endif (WIN32)
+  set (install_targets ${install_targets} ${HDF5_F90_LIBSH_TARGET})
+endif (BUILD_SHARED_LIBS)
 
 #-----------------------------------------------------------------------------
 # Add file(s) to CMake Install
 #-----------------------------------------------------------------------------
 install (
-    FILES
-        ${HDF5_F90_SRC_SOURCE_DIR}/H5f90.h
-        ${HDF5_F90_SRC_SOURCE_DIR}/H5f90i.h
-        ${HDF5_F90_SRC_SOURCE_DIR}/H5f90proto.h
+    FILES 
+        ${HDF5_F90_SRC_SOURCE_DIR}/H5f90.h 
+        ${HDF5_F90_SRC_SOURCE_DIR}/H5f90i.h 
+        ${HDF5_F90_SRC_SOURCE_DIR}/H5f90proto.h 
         ${HDF5_F90_BINARY_DIR}/H5f90i_gen.h
         ${HDF5_F90_BINARY_DIR}/H5fortran_types.f90
-    DESTINATION
+    DESTINATION 
         ${HDF5_INSTALL_INCLUDE_DIR}
-    COMPONENT
+    COMPONENT 
         fortheaders
 )
 
-if (WIN32)
-  set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/\${BUILD_TYPE})
-else (WIN32)
-  set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY})
-endif (WIN32)
+if (BUILD_SHARED_LIBS)
+  if (WIN32)
+    set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared/\${BUILD_TYPE})
+  else (WIN32)
+    set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/shared)
+  endif (WIN32)
+else (BUILD_SHARED_LIBS)
+  if (WIN32)
+    set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static/\${BUILD_TYPE})
+  else (WIN32)
+    set (MOD_BUILD_DIR ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
+  endif (WIN32)
+endif (BUILD_SHARED_LIBS)
 
 set (mod_files
     ${MOD_BUILD_DIR}/h5fortran_types.mod
@@ -330,14 +396,13 @@ install (
 #-----------------------------------------------------------------------------
 if (HDF5_EXPORTED_TARGETS)
   if (BUILD_SHARED_LIBS)
-    INSTALL_TARGET_PDB (${HDF5_F90_C_LIB_TARGET} ${HDF5_INSTALL_BIN_DIR} fortlibraries)
-    #INSTALL_TARGET_PDB (${HDF5_F90_LIB_TARGET} ${HDF5_INSTALL_BIN_DIR} fortlibraries)
+    INSTALL_TARGET_PDB (${HDF5_F90_C_LIBSH_TARGET} ${HDF5_INSTALL_BIN_DIR} fortlibraries)
+    #INSTALL_TARGET_PDB (${HDF5_F90_LIBSH_TARGET} ${HDF5_INSTALL_BIN_DIR} fortlibraries)
   endif (BUILD_SHARED_LIBS)
 
   install (
       TARGETS
-          ${HDF5_F90_C_LIB_TARGET}
-          ${HDF5_F90_LIB_TARGET}
+          ${install_targets}
       EXPORT
           ${HDF5_EXPORTED_TARGETS}
       LIBRARY DESTINATION ${HDF5_INSTALL_LIB_DIR} COMPONENT fortlibraries
diff --git a/fortran/test/CMakeLists.txt b/fortran/test/CMakeLists.txt
index 2893156..a2711c0 100644
--- a/fortran/test/CMakeLists.txt
+++ b/fortran/test/CMakeLists.txt
@@ -9,56 +9,103 @@ INCLUDE_DIRECTORIES (${HDF5_F90_BINARY_DIR} ${HDF5_F90_SRC_DIR}/src)
 #-----------------------------------------------------------------------------
 # Add Test Lib
 #-----------------------------------------------------------------------------
-add_library (${HDF5_F90_C_TEST_LIB_TARGET} ${LIB_TYPE} t.c)
+add_library (${HDF5_F90_C_TEST_LIB_TARGET} STATIC t.c)
 set_source_files_properties (t.c PROPERTIES LANGUAGE C)
-TARGET_C_PROPERTIES (${HDF5_F90_C_TEST_LIB_TARGET} ${LIB_TYPE} " " " ")
+TARGET_C_PROPERTIES (${HDF5_F90_C_TEST_LIB_TARGET} STATIC " " " ")
 target_link_libraries (${HDF5_F90_C_TEST_LIB_TARGET}
     ${HDF5_F90_C_LIB_TARGET}
     ${HDF5_TEST_LIB_TARGET}
 )
-H5_SET_LIB_OPTIONS (${HDF5_F90_C_TEST_LIB_TARGET} ${HDF5_F90_C_TEST_LIB_NAME} ${LIB_TYPE})
+H5_SET_LIB_OPTIONS (${HDF5_F90_C_TEST_LIB_TARGET} ${HDF5_F90_C_TEST_LIB_NAME} STATIC)
 set_target_properties (${HDF5_F90_C_TEST_LIB_TARGET} PROPERTIES
     FOLDER libraries/test/fortran
     LINKER_LANGUAGE C
     INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
 )
+if (BUILD_SHARED_LIBS)
+  add_library (${HDF5_F90_C_TEST_LIBSH_TARGET} SHARED t.c)
+  TARGET_C_PROPERTIES (${HDF5_F90_C_TEST_LIBSH_TARGET} SHARED " " " ")
+  target_link_libraries (${HDF5_F90_C_TEST_LIBSH_TARGET}
+      ${HDF5_F90_C_LIBSH_TARGET}
+      ${HDF5_TEST_LIBSH_TARGET}
+  )
+  H5_SET_LIB_OPTIONS (${HDF5_F90_C_TEST_LIBSH_TARGET} ${HDF5_F90_C_TEST_LIB_NAME} SHARED)
+  set_target_properties (${HDF5_F90_C_TEST_LIBSH_TARGET} PROPERTIES
+      FOLDER libraries/test/fortran
+      LINKER_LANGUAGE C
+      COMPILE_DEFINITIONS "H5_BUILT_AS_DYNAMIC_LIB"
+      INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
+      INTERFACE_COMPILE_DEFINITIONS H5_BUILT_AS_DYNAMIC_LIB=1
+  )
+endif (BUILD_SHARED_LIBS)
 
 # See if the F2008 intrinsic STORAGE_SIZE and C_SIZEOF are supported. If not then
 # fall back to F2003. If F2003 not supported then use F90 for the tests.
 
 set_source_files_properties (tf_F90.f90 tf_F03.f90 tf_F08.f90 tf.f90 PROPERTIES LANGUAGE Fortran)
 if (FORTRAN_HAVE_STORAGE_SIZE AND FORTRAN_HAVE_C_SIZEOF)
- add_library (${HDF5_F90_TEST_LIB_TARGET} ${LIB_TYPE} tf_F08.f90 tf.f90)
+  add_library (${HDF5_F90_TEST_LIB_TARGET} STATIC tf_F08.f90 tf.f90)
+  if (BUILD_SHARED_LIBS)
+    add_library (${HDF5_F90_TEST_LIBSH_TARGET} SHARED tf_F08.f90 tf.f90)
+  endif (BUILD_SHARED_LIBS)
 elseif (HDF5_ENABLE_F2003)
- add_library (${HDF5_F90_TEST_LIB_TARGET} ${LIB_TYPE} tf_F03.f90 tf.f90)
+  add_library (${HDF5_F90_TEST_LIB_TARGET} STATIC tf_F03.f90 tf.f90)
+  if (BUILD_SHARED_LIBS)
+    add_library (${HDF5_F90_TEST_LIBSH_TARGET} SHARED tf_F03.f90 tf.f90)
+  endif (BUILD_SHARED_LIBS)
 else (FORTRAN_HAVE_STORAGE_SIZE AND FORTRAN_HAVE_C_SIZEOF)
- add_library (${HDF5_F90_TEST_LIB_TARGET} ${LIB_TYPE} tf_F90.f90 tf.f90) 
-endif (FORTRAN_HAVE_STORAGE_SIZE AND FORTRAN_HAVE_C_SIZEOF)
-
-
-set (SHARED_LINK_FLAGS " ")
-if (WIN32)
+  add_library (${HDF5_F90_TEST_LIB_TARGET} STATIC tf_F90.f90 tf.f90) 
   if (BUILD_SHARED_LIBS)
-    set_property (TARGET ${HDF5_F90_TEST_LIB_TARGET} APPEND PROPERTY COMPILE_DEFINITIONS BUILD_HDF5_TEST_DLL)
-    if (MSVC)
-      set (SHARED_LINK_FLAGS "/DLL")
-    endif (MSVC)
+    add_library (${HDF5_F90_TEST_LIBSH_TARGET} SHARED tf_F90.f90 tf.f90) 
   endif (BUILD_SHARED_LIBS)
-  set_property (TARGET ${HDF5_F90_TEST_LIB_TARGET} APPEND PROPERTY COMPILE_DEFINITIONS HDF5F90_WINDOWS)
-endif (WIN32)
-TARGET_FORTRAN_PROPERTIES (${HDF5_F90_TEST_LIB_TARGET} ${LIB_TYPE} " " ${SHARED_LINK_FLAGS})
+endif (FORTRAN_HAVE_STORAGE_SIZE AND FORTRAN_HAVE_C_SIZEOF)
+
+TARGET_FORTRAN_PROPERTIES (${HDF5_F90_TEST_LIB_TARGET} STATIC " " " ")
 target_link_libraries (${HDF5_F90_TEST_LIB_TARGET}
     ${HDF5_F90_C_TEST_LIB_TARGET}
     ${HDF5_F90_LIB_TARGET}
     ${HDF5_LIB_TARGET}
 )
-H5_SET_LIB_OPTIONS (${HDF5_F90_TEST_LIB_TARGET} ${HDF5_F90_TEST_LIB_NAME} ${LIB_TYPE})
+H5_SET_LIB_OPTIONS (${HDF5_F90_TEST_LIB_TARGET} ${HDF5_F90_TEST_LIB_NAME} STATIC)
+target_include_directories (${HDF5_F90_TEST_LIB_TARGET} PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
 set_target_properties (${HDF5_F90_TEST_LIB_TARGET} PROPERTIES
     FOLDER libraries/test/fortran
     LINKER_LANGUAGE Fortran
     INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
-    Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}
+    Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
 )
+if (WIN32)
+  set_property (TARGET ${HDF5_F90_TEST_LIB_TARGET} APPEND PROPERTY
+        COMPILE_DEFINITIONS "HDF5F90_WINDOWS"
+    )
+endif (WIN32)
+if (BUILD_SHARED_LIBS)
+  set (SHARED_LINK_FLAGS " ")
+  if (WIN32 AND MSVC)
+    set (SHARED_LINK_FLAGS "/DLL")
+  endif (WIN32 AND MSVC)
+  TARGET_FORTRAN_PROPERTIES (${HDF5_F90_TEST_LIBSH_TARGET} SHARED " " ${SHARED_LINK_FLAGS})
+  target_link_libraries (${HDF5_F90_TEST_LIBSH_TARGET}
+      ${HDF5_F90_C_TEST_LIBSH_TARGET}
+      ${HDF5_F90_LIBSH_TARGET}
+      ${HDF5_LIBSH_TARGET}
+  )
+  H5_SET_LIB_OPTIONS (${HDF5_F90_TEST_LIBSH_TARGET} ${HDF5_F90_TEST_LIB_NAME} SHARED)
+  target_include_directories (${HDF5_F90_TEST_LIBSH_TARGET} PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/shared)
+  set_target_properties (${HDF5_F90_TEST_LIBSH_TARGET} PROPERTIES
+      FOLDER libraries/test/fortran
+      LINKER_LANGUAGE Fortran
+      COMPILE_DEFINITIONS "H5_BUILT_AS_DYNAMIC_LIB"
+      INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
+      INTERFACE_COMPILE_DEFINITIONS H5_BUILT_AS_DYNAMIC_LIB=1
+      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/shared
+  )
+  if (WIN32)
+    set_property (TARGET ${HDF5_F90_TEST_LIBSH_TARGET} APPEND PROPERTY
+        COMPILE_DEFINITIONS "BUILD_HDF5_TEST_DLL;HDF5F90_WINDOWS"
+    )
+  endif (WIN32)
+endif (BUILD_SHARED_LIBS)
 
 #-----------------------------------------------------------------------------
 # Add Tests
@@ -82,8 +129,8 @@ add_executable (testhdf5_fortran
     tH5Z.f90
     tHDF5.f90
 )
-TARGET_NAMING (testhdf5_fortran ${LIB_TYPE})
-TARGET_FORTRAN_PROPERTIES (testhdf5_fortran ${LIB_TYPE} " " " ")
+TARGET_NAMING (testhdf5_fortran STATIC)
+TARGET_FORTRAN_PROPERTIES (testhdf5_fortran STATIC " " " ")
 target_link_libraries (testhdf5_fortran 
     ${HDF5_F90_TEST_LIB_TARGET}
     ${HDF5_F90_LIB_TARGET}
@@ -96,8 +143,43 @@ target_include_directories (testhdf5_fortran PRIVATE ${CMAKE_Fortran_MODULE_DIRE
 set_target_properties (testhdf5_fortran PROPERTIES
     LINKER_LANGUAGE Fortran
     FOLDER test/fortran
-    Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}
+    Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
 )
+if (BUILD_SHARED_LIBS)
+  add_executable (testhdf5_fortran-shared
+      fortranlib_test.f90
+      tH5A.f90
+      tH5D.f90
+      tH5E.f90
+      tH5F.f90
+      tH5G.f90
+      tH5I.f90
+      tH5P.f90
+      tH5R.f90
+      tH5S.f90
+      tH5Sselect.f90
+      tH5T.f90
+      tH5VL.f90
+      tH5Z.f90
+      tHDF5.f90
+  )
+  TARGET_NAMING (testhdf5_fortran-shared SHARED)
+  TARGET_FORTRAN_PROPERTIES (testhdf5_fortran-shared SHARED " " " ")
+  target_link_libraries (testhdf5_fortran-shared 
+      ${HDF5_F90_TEST_LIBSH_TARGET}
+      ${HDF5_F90_LIBSH_TARGET}
+      ${HDF5_LIBSH_TARGET}
+  )
+  if (WIN32 AND MSVC)
+    target_link_libraries (testhdf5_fortran-shared "ws2_32.lib")
+  endif (WIN32 AND MSVC)
+  target_include_directories (testhdf5_fortran-shared PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/shared)
+  set_target_properties (testhdf5_fortran-shared PROPERTIES
+        LINKER_LANGUAGE Fortran
+        FOLDER test/fortran
+        Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/shared
+  )
+endif (BUILD_SHARED_LIBS)
 
 #-- Adding test for testhdf5_fortran_1_8
 add_executable (testhdf5_fortran_1_8
@@ -108,8 +190,8 @@ add_executable (testhdf5_fortran_1_8
     tH5MISC_1_8.f90
     tHDF5_1_8.f90
 )
-TARGET_NAMING (testhdf5_fortran_1_8 ${LIB_TYPE})
-TARGET_FORTRAN_PROPERTIES (testhdf5_fortran_1_8 ${LIB_TYPE} " " " ")
+TARGET_NAMING (testhdf5_fortran_1_8 STATIC)
+TARGET_FORTRAN_PROPERTIES (testhdf5_fortran_1_8 STATIC " " " ")
 target_link_libraries (testhdf5_fortran_1_8 
     ${HDF5_F90_TEST_LIB_TARGET}
     ${HDF5_F90_LIB_TARGET}
@@ -122,8 +204,34 @@ target_include_directories (testhdf5_fortran_1_8 PRIVATE ${CMAKE_Fortran_MODULE_
 set_target_properties (testhdf5_fortran_1_8 PROPERTIES
     LINKER_LANGUAGE Fortran
     FOLDER test/fortran
-    Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}
+    Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
 )
+if (BUILD_SHARED_LIBS)
+  add_executable (testhdf5_fortran_1_8-shared
+      fortranlib_test_1_8.f90
+      tH5O.f90
+      tH5A_1_8.f90
+      tH5G_1_8.f90
+      tH5MISC_1_8.f90
+      tHDF5_1_8.f90
+  )
+  TARGET_NAMING (testhdf5_fortran_1_8-shared SHARED)
+  TARGET_FORTRAN_PROPERTIES (testhdf5_fortran_1_8-shared SHARED " " " ")
+  target_link_libraries (testhdf5_fortran_1_8-shared 
+      ${HDF5_F90_TEST_LIBSH_TARGET}
+      ${HDF5_F90_LIBSH_TARGET}
+      ${HDF5_LIBSH_TARGET}
+  )
+  if (WIN32 AND MSVC)
+    target_link_libraries (testhdf5_fortran_1_8-shared "ws2_32.lib")
+  endif (WIN32 AND MSVC)
+  target_include_directories (testhdf5_fortran_1_8-shared PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/shared)
+  set_target_properties (testhdf5_fortran_1_8-shared PROPERTIES
+        LINKER_LANGUAGE Fortran
+        FOLDER test/fortran
+        Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/shared
+  )
+endif (BUILD_SHARED_LIBS)
 
 #-- Adding test for fortranlib_test_F03
 if (HDF5_ENABLE_F2003)
@@ -137,8 +245,8 @@ if (HDF5_ENABLE_F2003)
       tH5T_F03.f90
       tHDF5_F03.f90
   )
-  TARGET_NAMING (fortranlib_test_F03 ${LIB_TYPE})
-  TARGET_FORTRAN_PROPERTIES (fortranlib_test_F03 ${LIB_TYPE} " " " ")
+  TARGET_NAMING (fortranlib_test_F03 STATIC)
+  TARGET_FORTRAN_PROPERTIES (fortranlib_test_F03 STATIC " " " ")
   target_link_libraries (fortranlib_test_F03 
       ${HDF5_F90_TEST_LIB_TARGET}
       ${HDF5_F90_LIB_TARGET}
@@ -151,14 +259,42 @@ if (HDF5_ENABLE_F2003)
   set_target_properties (fortranlib_test_F03 PROPERTIES
       LINKER_LANGUAGE Fortran
       FOLDER test/fortran
-      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}
+      Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
+  )
+  if (BUILD_SHARED_LIBS)
+    add_executable (fortranlib_test_F03-shared
+        fortranlib_test_F03.f90
+        tH5E_F03.f90
+        tH5F_F03.f90
+        tH5L_F03.f90
+        tH5O_F03.f90
+        tH5P_F03.f90
+        tH5T_F03.f90
+        tHDF5_F03.f90
+    )
+    TARGET_NAMING (fortranlib_test_F03-shared SHARED)
+    TARGET_FORTRAN_PROPERTIES (fortranlib_test_F03-shared SHARED " " " ")
+    target_link_libraries (fortranlib_test_F03-shared 
+        ${HDF5_F90_TEST_LIBSH_TARGET}
+        ${HDF5_F90_LIBSH_TARGET}
+        ${HDF5_LIBSH_TARGET}
+    )
+    if (WIN32 AND MSVC)
+      target_link_libraries (fortranlib_test_F03-shared "ws2_32.lib")
+    endif (WIN32 AND MSVC)
+    target_include_directories (fortranlib_test_F03-shared PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/shared)
+    set_target_properties (fortranlib_test_F03-shared PROPERTIES
+        LINKER_LANGUAGE Fortran
+        FOLDER test/fortran
+        Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/shared
   )
+  endif (BUILD_SHARED_LIBS)
 endif (HDF5_ENABLE_F2003)
 
 #-- Adding test for fflush1
 add_executable (fflush1 fflush1.f90)
-TARGET_NAMING (fflush1 ${LIB_TYPE})
-TARGET_FORTRAN_PROPERTIES (fflush1 ${LIB_TYPE} " " " ")
+TARGET_NAMING (fflush1 STATIC)
+TARGET_FORTRAN_PROPERTIES (fflush1 STATIC " " " ")
 target_link_libraries (fflush1 
     ${HDF5_F90_LIB_TARGET}
     ${HDF5_F90_TEST_LIB_TARGET}
@@ -171,13 +307,32 @@ target_include_directories (fflush1 PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/st
 set_target_properties (fflush1 PROPERTIES
     LINKER_LANGUAGE Fortran
     FOLDER test/fortran
-    Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}
+    Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
 )
+if (BUILD_SHARED_LIBS)
+  add_executable (fflush1-shared fflush1.f90)
+  TARGET_NAMING (fflush1-shared SHARED)
+  TARGET_FORTRAN_PROPERTIES (fflush1-shared SHARED " " " ")
+  target_link_libraries (fflush1-shared 
+      ${HDF5_F90_LIBSH_TARGET}
+      ${HDF5_F90_TEST_LIBSH_TARGET}
+      ${HDF5_LIBSH_TARGET}
+  )
+  if (WIN32 AND MSVC)
+    target_link_libraries (fflush1-shared "ws2_32.lib")
+  endif (WIN32 AND MSVC)
+  target_include_directories (fflush1-shared PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/shared)
+  set_target_properties (fflush1-shared PROPERTIES
+        LINKER_LANGUAGE Fortran
+        FOLDER test/fortran
+        Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/shared
+  )
+endif (BUILD_SHARED_LIBS)
 
 #-- Adding test for fflush2
 add_executable (fflush2 fflush2.f90)
-TARGET_NAMING (fflush2 ${LIB_TYPE})
-TARGET_FORTRAN_PROPERTIES (fflush2 ${LIB_TYPE} " " " ")
+TARGET_NAMING (fflush2 STATIC)
+TARGET_FORTRAN_PROPERTIES (fflush2 STATIC " " " ")
 target_link_libraries (fflush2 
     ${HDF5_F90_TEST_LIB_TARGET}
     ${HDF5_F90_LIB_TARGET}
@@ -190,7 +345,26 @@ target_include_directories (fflush2 PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/st
 set_target_properties (fflush2 PROPERTIES
     LINKER_LANGUAGE Fortran
     FOLDER test/fortran
-    Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}
+    Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/static
 )
+if (BUILD_SHARED_LIBS)
+  add_executable (fflush2-shared fflush2.f90)
+  TARGET_NAMING (fflush2-shared SHARED)
+  TARGET_FORTRAN_PROPERTIES (fflush2-shared SHARED " " " ")
+  target_link_libraries (fflush2-shared 
+      ${HDF5_F90_TEST_LIBSH_TARGET}
+      ${HDF5_F90_LIBSH_TARGET}
+      ${HDF5_LIBSH_TARGET}
+  )
+  if (WIN32 AND MSVC)
+    target_link_libraries (fflush2-shared "ws2_32.lib")
+  endif (WIN32 AND MSVC)
+  target_include_directories (fflush2-shared PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/shared)
+  set_target_properties (fflush2-shared PROPERTIES
+        LINKER_LANGUAGE Fortran
+        FOLDER test/fortran
+        Fortran_MODULE_DIRECTORY ${CMAKE_Fortran_MODULE_DIRECTORY}/shared
+  )
+endif (BUILD_SHARED_LIBS)
 
 include (CMakeTests.cmake)
diff --git a/fortran/test/CMakeTests.cmake b/fortran/test/CMakeTests.cmake
index 4df50ad..94f6b64 100644
--- a/fortran/test/CMakeTests.cmake
+++ b/fortran/test/CMakeTests.cmake
@@ -26,3 +26,29 @@ add_test (NAME FORTRAN_fflush1 COMMAND $<TARGET_FILE:fflush1>)
 #-- Adding test for fflush2
 add_test (NAME FORTRAN_fflush2 COMMAND $<TARGET_FILE:fflush2>)
 set_tests_properties (FORTRAN_fflush2 PROPERTIES DEPENDS FORTRAN_fflush1)
+
+if (BUILD_SHARED_LIBS)
+  add_test (NAME FORTRAN_testhdf5_fortran-shared COMMAND $<TARGET_FILE:testhdf5_fortran-shared>)
+  set_tests_properties (FORTRAN_testhdf5_fortran-shared PROPERTIES PASS_REGULAR_EXPRESSION "[ ]*0 error.s")
+  set_tests_properties (FORTRAN_testhdf5_fortran-shared PROPERTIES DEPENDS FORTRAN_testhdf5_fortran)
+
+  #-- Adding test for testhdf5_fortran_1_8
+  add_test (NAME FORTRAN_testhdf5_fortran_1_8-shared COMMAND $<TARGET_FILE:testhdf5_fortran_1_8-shared>)
+  set_tests_properties (FORTRAN_testhdf5_fortran_1_8-shared PROPERTIES PASS_REGULAR_EXPRESSION "[ ]*0 error.s")
+  set_tests_properties (FORTRAN_testhdf5_fortran_1_8-shared PROPERTIES DEPENDS FORTRAN_testhdf5_fortran_1_8)
+
+  #-- Adding test for fortranlib_test_F03
+  if (HDF5_ENABLE_F2003)
+    add_test (NAME FORTRAN_fortranlib_test_F03-shared COMMAND $<TARGET_FILE:fortranlib_test_F03-shared>)
+    set_tests_properties (FORTRAN_fortranlib_test_F03-shared PROPERTIES PASS_REGULAR_EXPRESSION "[ ]*0 error.s")
+    set_tests_properties (FORTRAN_fortranlib_test_F03-shared PROPERTIES DEPENDS FORTRAN_fortranlib_test_F03)
+  endif (HDF5_ENABLE_F2003)
+
+  #-- Adding test for fflush1
+  add_test (NAME FORTRAN_fflush1-shared COMMAND $<TARGET_FILE:fflush1-shared>)
+  set_tests_properties (FORTRAN_fflush1-shared PROPERTIES DEPENDS FORTRAN_fflush2)
+
+  #-- Adding test for fflush2
+  add_test (NAME FORTRAN_fflush2-shared COMMAND $<TARGET_FILE:fflush2-shared>)
+  set_tests_properties (FORTRAN_fflush2-shared PROPERTIES DEPENDS FORTRAN_fflush1-shared)
+endif (BUILD_SHARED_LIBS)
diff --git a/fortran/testpar/CMakeLists.txt b/fortran/testpar/CMakeLists.txt
index 98ef6c8..4f21419 100644
--- a/fortran/testpar/CMakeLists.txt
+++ b/fortran/testpar/CMakeLists.txt
@@ -16,8 +16,8 @@ add_executable (parallel_test
     hyper.f90
     mdset.f90
 )
-TARGET_NAMING (parallel_test ${LIB_TYPE})
-TARGET_FORTRAN_PROPERTIES (parallel_test ${LIB_TYPE} " " " ")
+TARGET_NAMING (parallel_test STATIC)
+TARGET_FORTRAN_PROPERTIES (parallel_test STATIC " " " ")
 target_link_libraries (parallel_test 
     ${HDF5_F90_TEST_LIB_TARGET}
     ${HDF5_F90_LIB_TARGET}
@@ -27,7 +27,7 @@ target_link_libraries (parallel_test
 if (WIN32 AND MSVC)
   target_link_libraries (parallel_test "ws2_32.lib")
 endif (WIN32 AND MSVC)
-target_include_directories (parallel_test PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY})
+target_include_directories (parallel_test PRIVATE ${CMAKE_Fortran_MODULE_DIRECTORY}/static)
 set_target_properties (parallel_test PROPERTIES LINKER_LANGUAGE Fortran)
 set_target_properties (parallel_test PROPERTIES FOLDER test/fortran)