Merge branch 'develop' into hdf5_1_10.sync

2024-12-03 02:32:04 +08:00 · 2018-05-23 14:56:16 -05:00 · 2018-05-23 14:56:16 -05:00 · d198767957
commit d198767957
parent 7616677a52 2b0fb7e3f1
6 changed files with 39 additions and 50 deletions
--- 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
--- 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}
--- 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
--- a/hl/fortran/src/CMakeLists.txt
+++ b/hl/fortran/src/CMakeLists.txt
@ -201,7 +201,6 @@ if (BUILD_SHARED_LIBS)
          "H5_BUILT_AS_DYNAMIC_LIB"
      PRIVATE
          $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:BUILD_HDF5_HL_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_HL_F90_LIBSH_TARGET}
--- a/hl/fortran/test/CMakeLists.txt
+++ b/hl/fortran/test/CMakeLists.txt
@ -47,7 +47,6 @@ macro (ADD_H5_FORTRAN_EXE file)
    )
    target_compile_options(hl_f90_${file}-shared
        PRIVATE
-            $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:/dll>
            $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:${WIN_COMPILE_FLAGS}>
    )
    target_link_libraries (hl_f90_${file}-shared
--- a/java/test/junit.sh.in
+++ b/java/test/junit.sh.in
@ -920,48 +920,49 @@ else
    nerrors="`expr $nerrors + 1`"
 fi

-if test $USE_FILTER_SZIP = "yes"; then
-    echo "$JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestH5E"
-    TESTING JUnit-TestH5E
-    ($RUNSERIAL $JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestH5E > JUnit-TestH5E.ext)
+if test "X-$BUILD_MODE" = "X-production" ; then
+    if test $USE_FILTER_SZIP = "yes"; then
+        echo "$JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestH5E"
+        TESTING JUnit-TestH5E
+        ($RUNSERIAL $JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestH5E > JUnit-TestH5E.ext)

-    # Extract file name, line number, version and thread IDs because they may be different
-    sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
-        -e 's/line [0-9]*/line (number)/' \
-        -e 's/Time: [0-9]*\.[0-9]*/Time:  XXXX/' \
-        -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-        -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
-        JUnit-TestH5E.ext > JUnit-TestH5E.out
+        # Extract file name, line number, version and thread IDs because they may be different
+        sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
+            -e 's/line [0-9]*/line (number)/' \
+            -e 's/Time: [0-9]*\.[0-9]*/Time:  XXXX/' \
+            -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
+            -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
+            JUnit-TestH5E.ext > JUnit-TestH5E.out

-    if diff JUnit-TestH5E.out JUnit-TestH5E.txt > /dev/null; then
-        echo "  PASSED      JUnit-TestH5E"
-    else
-        echo "**FAILED**    JUnit-TestH5E"
-        nerrors="`expr $nerrors + 1`"
+        if diff JUnit-TestH5E.out JUnit-TestH5E.txt > /dev/null; then
+            echo "  PASSED      JUnit-TestH5E"
+        else
+            echo "**FAILED**    JUnit-TestH5E"
+            nerrors="`expr $nerrors + 1`"
+        fi
+    fi
+
+    if test $USE_FILTER_SZIP = "yes"; then
+        echo "$JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestH5Edefault"
+        TESTING JUnit-TestH5Edefault
+        ($RUNSERIAL $JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestH5Edefault > JUnit-TestH5Edefault.ext)
+
+        # Extract file name, line number, version and thread IDs because they may be different
+        sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
+            -e 's/line [0-9]*/line (number)/' \
+            -e 's/Time: [0-9]*\.[0-9]*/Time:  XXXX/' \
+            -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
+            -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
+            JUnit-TestH5Edefault.ext > JUnit-TestH5Edefault.out
+
+        if diff JUnit-TestH5Edefault.out JUnit-TestH5Edefault.txt > /dev/null; then
+            echo "  PASSED      JUnit-TestH5Edefault"
+        else
+            echo "**FAILED**    JUnit-TestH5Edefault"
+            nerrors="`expr $nerrors + 1`"
+        fi
    fi
 fi
-
-if test $USE_FILTER_SZIP = "yes"; then
-    echo "$JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestH5Edefault"
-    TESTING JUnit-TestH5Edefault
-    ($RUNSERIAL $JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestH5Edefault > JUnit-TestH5Edefault.ext)
-
-    # Extract file name, line number, version and thread IDs because they may be different
-    sed -e 's/thread [0-9]*/thread (IDs)/' -e 's/: .*\.c /: (file name) /' \
-        -e 's/line [0-9]*/line (number)/' \
-        -e 's/Time: [0-9]*\.[0-9]*/Time:  XXXX/' \
-        -e 's/v[1-9]*\.[0-9]*\./version (number)\./' \
-        -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
-        JUnit-TestH5Edefault.ext > JUnit-TestH5Edefault.out
-
-    if diff JUnit-TestH5Edefault.out JUnit-TestH5Edefault.txt > /dev/null; then
-        echo "  PASSED      JUnit-TestH5Edefault"
-    else
-        echo "**FAILED**    JUnit-TestH5Edefault"
-        nerrors="`expr $nerrors + 1`"
-    fi
-fi
-
 if test $USE_FILTER_SZIP = "yes"; then
    echo "$JAVAEXE $JAVAEXEFLAGS -Xmx1024M -Dorg.slf4j.simpleLogger.defaultLog=trace -Djava.library.path=$BLDLIBDIR -cp $CLASSPATH -ea org.junit.runner.JUnitCore test.TestH5Giterate"
    TESTING JUnit-TestH5Giterate