Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)

* commit '2b0fb7e3f1f7da5b23d430702493ed4fb7f87166': (21 commits)
  HDFFV-9739 only executes H5E tests in production
  Remove link flag from compile command
  fix typo
  Add release note
  Correct attribute location
  HDFFV-9739 fix  copy testfiles command
  HDFFV-9739 remove obsolete test files
  HDFFV-9739 dup test file for concurrent tests
  HDFFV-9739 Fix autotools script
  HDFFV-9739 Change autotools test scripts
  Fix typo
  HDFFV-9739 Update test reference
  Update current windows test machines
  HDFFV-9739 Grab err number before API call
  HDFFV-9739 Add release note
  Adjust test names for concurrent tests
  Fix soversion
  HDFFV-9739 Fix copy name
  HDFFV-9739 factor out tests into separate JUnit
  Updated the threadsafety test to use error macros instead of asserts.
  ...

3 files changed, 0 insertions, 10 deletions

diff --git a/fortran/examples/CMakeLists.txt b/fortran/examples/CMakeLists.txt
index cc14651..c836c17 100644
--- a/fortran/examples/CMakeLists.txt
+++ b/fortran/examples/CMakeLists.txt
@@ -69,7 +69,6 @@ foreach (example ${examples})
     )
     target_compile_options(f90_ex_${example}-shared
         PRIVATE
-            $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:/dll>
             $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}>
     )
     target_link_libraries (f90_ex_${example}-shared
@@ -129,7 +128,6 @@ foreach (example ${F2003_examples})
     )
     target_compile_options(f03_ex_${example}-shared
         PRIVATE
-            $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:/dll>
             $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}>
     )
     target_link_libraries (f03_ex_${example}-shared
@@ -189,7 +187,6 @@ if (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)
     )
     target_compile_options(f90_ex_ph5example-shared
         PRIVATE
-            $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:/dll>
             $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}>
     )
     target_link_libraries (f90_ex_ph5example-shared
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt
index a29fb86..5750d05 100644
--- a/fortran/src/CMakeLists.txt
+++ b/fortran/src/CMakeLists.txt
@@ -305,7 +305,6 @@ if (BUILD_SHARED_LIBS)
           "H5_BUILT_AS_DYNAMIC_LIB"
       PRIVATE
           $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:BUILD_HDF5_DLL;HDF5F90_WINDOWS>
-          $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:/dll>
           $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}>
   )
   target_link_libraries (${HDF5_F90_LIBSH_TARGET}
diff --git a/fortran/test/CMakeLists.txt b/fortran/test/CMakeLists.txt
index b45154e..fc1add1 100644
--- a/fortran/test/CMakeLists.txt
+++ b/fortran/test/CMakeLists.txt
@@ -169,7 +169,6 @@ if (BUILD_SHARED_LIBS)
           "H5_BUILT_AS_DYNAMIC_LIB"
       PRIVATE
           $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:BUILD_HDF5_TEST_DLL;HDF5F90_WINDOWS>
-          $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:/dll>
           $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}>
   )
   target_link_libraries (${HDF5_F90_TEST_LIBSH_TARGET}
@@ -271,7 +270,6 @@ if (BUILD_SHARED_LIBS)
   )
   target_compile_options(testhdf5_fortran-shared
       PRIVATE
-          $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:/dll>
           $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}>
   )
   target_link_libraries (testhdf5_fortran-shared
@@ -347,7 +345,6 @@ if (BUILD_SHARED_LIBS)
   )
   target_compile_options(testhdf5_fortran_1_8-shared
       PRIVATE
-          $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:/dll>
           $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}>
   )
   target_link_libraries (testhdf5_fortran_1_8-shared
@@ -427,7 +424,6 @@ if (BUILD_SHARED_LIBS)
   )
   target_compile_options(fortranlib_test_F03-shared
       PRIVATE
-          $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:/dll>
           $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}>
   )
   target_link_libraries (fortranlib_test_F03-shared
@@ -489,7 +485,6 @@ if (BUILD_SHARED_LIBS)
   )
   target_compile_options(fflush1-shared
       PRIVATE
-          $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:/dll>
           $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}>
   )
   target_link_libraries (fflush1-shared
@@ -551,7 +546,6 @@ if (BUILD_SHARED_LIBS)
   )
   target_compile_options(fflush2-shared
       PRIVATE
-          $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:/dll>
           $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}>
   )
   target_link_libraries (fflush2-shared