Misc missed things from previous merges (#3295)

5 files changed, 49 insertions, 38 deletions

diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake
index 01fe139..e518b85 100644
--- a/config/cmake/ConfigureChecks.cmake
+++ b/config/cmake/ConfigureChecks.cmake
@@ -138,7 +138,7 @@ endif ()
 ## Check for non-standard extension quadmath.h
 
 CHECK_INCLUDE_FILES(quadmath.h C_HAVE_QUADMATH)
-if (${C_HAVE_QUADMATH})
+if (C_HAVE_QUADMATH)
   set(${HDF_PREFIX}_HAVE_QUADMATH_H 1)
 else ()
   set(${HDF_PREFIX}_HAVE_QUADMATH_H 0)
@@ -767,7 +767,7 @@ endif()
 
 if (HDF5_BUILD_FORTRAN)
   HDF_CHECK_TYPE_SIZE(__float128 _SIZEOF___FLOAT128)
-  if (${_SIZEOF___FLOAT128})
+  if (_SIZEOF___FLOAT128)
     set (${HDF_PREFIX}_HAVE_FLOAT128 1)
     set (${HDF_PREFIX}_SIZEOF___FLOAT128 ${_SIZEOF___FLOAT128})
   else ()
@@ -776,7 +776,7 @@ if (HDF5_BUILD_FORTRAN)
   endif ()
 
   HDF_CHECK_TYPE_SIZE(_Quad _SIZEOF__QUAD)
-  if (NOT ${_SIZEOF__QUAD})
+  if (NOT _SIZEOF__QUAD)
     set (${HDF_PREFIX}_SIZEOF__QUAD 0)
   else ()
     set (${HDF_PREFIX}_SIZEOF__QUAD ${_SIZEOF__QUAD})
@@ -856,7 +856,7 @@ if (HDF5_BUILD_FORTRAN)
 #define C_LDBL_DIG DECIMAL_DIG\n\
 #else\n\
 #define C_LDBL_DIG LDBL_DIG\n\
-#endif\n\nint main() {\nprintf(\"\\%d\\\;\\%d\\\;\", C_LDBL_DIG, C_FLT128_DIG)\\\;\n\nreturn 0\\\;\n}\n
+#endif\n\nint main(void) {\nprintf(\"\\%d\\\;\\%d\\\;\", C_LDBL_DIG, C_FLT128_DIG)\\\;\n\nreturn 0\\\;\n}\n
          "
     )
 
@@ -924,9 +924,9 @@ endmacro ()
 #-----------------------------------------------------------------------------
 
 # ----------------------------------------------------------------------
-# Set the flag to indicate that the machine is using a special algorithm to convert
+# Set the flag to indicate that the machine is using a special algorithm toconvert
 # 'long double' to '(unsigned) long' values.  (This flag should only be set for
-# the IBM Power6 Linux.  When the bit sequence of long double is
+# the IBM Power Linux.  When the bit sequence of long double is
 # 0x4351ccf385ebc8a0bfcc2a3c3d855620, the converted value of (unsigned)long
 # is 0x004733ce17af227f, not the same as the library's conversion to 0x004733ce17af2282.
 # The machine's conversion gets the correct value.  We define the macro and disable
@@ -936,7 +936,7 @@ H5ConversionTests (${HDF_PREFIX}_LDOUBLE_TO_LONG_SPECIAL  "Checking IF your syst
 # ----------------------------------------------------------------------
 # Set the flag to indicate that the machine is using a special algorithm
 # to convert some values of '(unsigned) long' to 'long double' values.
-# (This flag should be off for all machines, except for IBM Power6 Linux,
+# (This flag should be off for all machines, except for IBM Power Linux,
 # when the bit sequences are 003fff..., 007fff..., 00ffff..., 01ffff...,
 # ..., 7fffff..., the compiler uses a unknown algorithm.  We define a
 # macro and skip the test for now until we know about the algorithm.
diff --git a/config/cmake/ConversionTests.c b/config/cmake/ConversionTests.c
index 80de31f..725f049 100644
--- a/config/cmake/ConversionTests.c
+++ b/config/cmake/ConversionTests.c
@@ -56,9 +56,11 @@ int HDF_NO_UBSAN main(void)
             ll = (long)ld;
             memcpy(s2, &ll, 8);
 
-            /* The library's algorithm converts it to 0x 00 47 33 ce 17 af 22 82
-             * and gets wrong value 20041683600089730 on the IBM Power6 Linux.
-             * But the IBM Power6 Linux converts it to 0x00 47 33 ce 17 af 22 7f
+            /* The library's algorithm converts it to 0x00 47 33 ce 17 af 22 82
+             * and gets wrong value 20041683600089730 on Linux on IBM Power
+             * architecture.
+             *
+             * But Linux on IBM Power converts it to 0x00 47 33 ce 17 af 22 7f
              * and gets the correct value 20041683600089727.  It uses some special
              * algorithm.  We're going to define the macro and skip the test until
              * we can figure out how they do it.
@@ -118,10 +120,11 @@ int HDF_NO_UBSAN main(void)
 
         /* The library converts the value to 0x434fffffffffffff8000000000000000.
          * In decimal it is 18014398509481982.000000, one value short of the original.
-         * The IBM Power6 Linux converts it to 0x4350000000000000bff0000000000000.
-         * The value is correct in decimal. It uses some special
-         * algorithm.  We're going to define the macro and skip the test until
-         * we can figure out how they do it.
+         *
+         * Linux on IBM Power architecture converts it to
+         * 0x4350000000000000bff0000000000000. The value is correct in decimal.
+         * It uses some special algorithm.  We're going to define the macro and
+         * skip the test until we can figure out how they do it.
          */
         if (s[0]==0x43 && s[1]==0x50 && s[2]==0x00 && s[3]==0x00 &&
             s[4]==0x00 && s[5]==0x00 && s[6]==0x00 && s[7]==0x00 &&
@@ -136,14 +139,14 @@ int HDF_NO_UBSAN main(void)
         ld = (long double)ull;
         memcpy(s, &ld, 16);
 
-        /* Use a different value from signed long to test. The problem is the same
-         * for both long and unsigned long. The value is 18446744073709551615.
+        /* Use a different value from signed long to test. The problem is the
+         * same for both long and unsigned long. The value is 18446744073709551615.
          * The library converts the value to 0x43effffffffffffffe000000000000000.
-         * In decimal it's 18446744073709548544.000000, very different from the original.
-         * The IBM Power6 Linux converts it to 0x43f0000000000000bff0000000000000.
-         * The value is correct in decimal. It uses some special
-         * algorithm.  We're going to define the macro and skip the test until
-         * we can figure out how they do it.
+         * In decimal it's 18446744073709548544.000000, very different from the
+         * original. Linux on IBM Power architecture converts it to
+         * 0x43f0000000000000bff0000000000000. The value is correct in decimal.
+         * It uses some special algorithm.  We're going to define the macro and
+         * skip the test until we can figure out how they do it.
          */
         if (s[0]==0x43 && s[1]==0xf0 && s[2]==0x00 && s[3]==0x00 &&
             s[4]==0x00 && s[5]==0x00 && s[6]==0x00 && s[7]==0x00 &&
diff --git a/config/cmake/HDFTests.c b/config/cmake/HDFTests.c
index 96460d7..3897390 100644
--- a/config/cmake/HDFTests.c
+++ b/config/cmake/HDFTests.c
@@ -12,7 +12,7 @@
 
 
 /* A simple test program to see if a function "works" */
-#define SIMPLE_TEST(x) int main(){ x; return 0; }
+#define SIMPLE_TEST(x) int main(void){ x; return 0; }
 
 
 #ifdef HAVE_ATTRIBUTE
@@ -93,7 +93,7 @@ int main ()
 
 #include <sys/types.h>
 
-int main()
+int main(void)
 {
     off64_t n = 0;
     return (int)n;
diff --git a/config/cmake/hdf5-config.cmake.in b/config/cmake/hdf5-config.cmake.in
index afcaeae..fa5bfcb 100644
--- a/config/cmake/hdf5-config.cmake.in
+++ b/config/cmake/hdf5-config.cmake.in
@@ -44,6 +44,7 @@ set (${HDF5_PACKAGE_NAME}_ENABLE_PLUGIN_SUPPORT @HDF5_ENABLE_PLUGIN_SUPPORT@)
 set (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT @HDF5_ENABLE_Z_LIB_SUPPORT@)
 set (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT  @HDF5_ENABLE_SZIP_SUPPORT@)
 set (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_ENCODING @HDF5_ENABLE_SZIP_ENCODING@)
+set (${HDF5_PACKAGE_NAME}_ENABLE_ROS3_VFD      @HDF5_ENABLE_ROS3_VFD@)
 set (${HDF5_PACKAGE_NAME}_ENABLE_SUBFILING_VFD @HDF5_ENABLE_SUBFILING_VFD@)
 set (${HDF5_PACKAGE_NAME}_BUILD_SHARED_LIBS    @H5_ENABLE_SHARED_LIB@)
 set (${HDF5_PACKAGE_NAME}_BUILD_STATIC_LIBS    @H5_ENABLE_STATIC_LIB@)
@@ -68,6 +69,11 @@ if (${HDF5_PACKAGE_NAME}_ENABLE_PARALLEL)
   find_package(MPI QUIET REQUIRED)
 endif ()
 
+if (${HDF5_PACKAGE_NAME}_ENABLE_THREADSAFE OR ${HDF5_PACKAGE_NAME}_ENABLE_SUBFILING_VFD)
+  set(THREADS_PREFER_PTHREAD_FLAG ON)
+  find_package(Threads QUIET REQUIRED)
+endif ()
+
 if (${HDF5_PACKAGE_NAME}_BUILD_JAVA)
   set (${HDF5_PACKAGE_NAME}_JAVA_INCLUDE_DIRS
       @PACKAGE_CURRENT_BUILD_DIR@/lib/jarhdf5-@HDF5_VERSION_STRING@.jar
diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in
index 00ae980..f60f0de 100644
--- a/config/cmake/libhdf5.settings.cmake.in
+++ b/config/cmake/libhdf5.settings.cmake.in
@@ -28,6 +28,7 @@ Linking Options:
                      AM_LDFLAGS: @AM_LDFLAGS@
                 Extra libraries: @LINK_LIBS@
                        Archiver: @CMAKE_AR@
+                       AR_FLAGS: 
                          Ranlib: @CMAKE_RANLIB@
 
 Languages:
@@ -44,24 +45,24 @@ Languages:
                Static C Library: @H5_ENABLE_STATIC_LIB@
 
                         Fortran: @HDF5_BUILD_FORTRAN@
-@BUILD_FORTRAN_CONDITIONAL_TRUE@               Fortran Compiler: @CMAKE_Fortran_COMPILER@ @CMAKE_Fortran_COMPILER_VERSION@
-@BUILD_FORTRAN_CONDITIONAL_TRUE@                  Fortran Flags: @CMAKE_Fortran_FLAGS@
-@BUILD_FORTRAN_CONDITIONAL_TRUE@               H5 Fortran Flags: @HDF5_CMAKE_Fortran_FLAGS@
-@BUILD_FORTRAN_CONDITIONAL_TRUE@               AM Fortran Flags: @AM_FCFLAGS@
-@BUILD_FORTRAN_CONDITIONAL_TRUE@         Shared Fortran Library: @H5_ENABLE_SHARED_LIB@
-@BUILD_FORTRAN_CONDITIONAL_TRUE@         Static Fortran Library: @H5_ENABLE_STATIC_LIB@
-@BUILD_FORTRAN_CONDITIONAL_TRUE@               Module Directory: @CMAKE_Fortran_MODULE_DIRECTORY@
+               Fortran Compiler: @CMAKE_Fortran_COMPILER@ @CMAKE_Fortran_COMPILER_VERSION@
+                  Fortran Flags: @CMAKE_Fortran_FLAGS@
+               H5 Fortran Flags: @HDF5_CMAKE_Fortran_FLAGS@
+               AM Fortran Flags: @AM_FCFLAGS@
+         Shared Fortran Library: @H5_ENABLE_SHARED_LIB@
+         Static Fortran Library: @H5_ENABLE_STATIC_LIB@
+               Module Directory: @CMAKE_Fortran_MODULE_DIRECTORY@
 
                             C++: @HDF5_BUILD_CPP_LIB@
-@BUILD_CXX_CONDITIONAL_TRUE@                   C++ Compiler: @CMAKE_CXX_COMPILER@ @CMAKE_CXX_COMPILER_VERSION@
-@BUILD_CXX_CONDITIONAL_TRUE@                      C++ Flags: @CMAKE_CXX_FLAGS@
-@BUILD_CXX_CONDITIONAL_TRUE@                   H5 C++ Flags: @HDF5_CMAKE_CXX_FLAGS@
-@BUILD_CXX_CONDITIONAL_TRUE@                   AM C++ Flags: @AM_CXXFLAGS@
-@BUILD_CXX_CONDITIONAL_TRUE@             Shared C++ Library: @H5_ENABLE_SHARED_LIB@
-@BUILD_CXX_CONDITIONAL_TRUE@             Static C++ Library: @H5_ENABLE_STATIC_LIB@
+                   C++ Compiler: @CMAKE_CXX_COMPILER@ @CMAKE_CXX_COMPILER_VERSION@
+                      C++ Flags: @CMAKE_CXX_FLAGS@
+                   H5 C++ Flags: @HDF5_CMAKE_CXX_FLAGS@
+                   AM C++ Flags: @AM_CXXFLAGS@
+             Shared C++ Library: @H5_ENABLE_SHARED_LIB@
+             Static C++ Library: @H5_ENABLE_STATIC_LIB@
 
-                            JAVA: @HDF5_BUILD_JAVA@
-@BUILD_JAVA_CONDITIONAL_TRUE@                 JAVA Compiler: @CMAKE_Java_COMPILER@ @Java_VERSION@
+                           JAVA: @HDF5_BUILD_JAVA@
+                  JAVA Compiler: @CMAKE_Java_COMPILER@ @Java_VERSION@
 
 Features:
 ---------
@@ -77,6 +78,7 @@ Dimension scales w/ new references: @DIMENSION_SCALES_WITH_NEW_REF@
                Default API mapping: @DEFAULT_API_VERSION@
     With deprecated public symbols: @HDF5_ENABLE_DEPRECATED_SYMBOLS@
             I/O filters (external): @EXTERNAL_FILTERS@
+                     Map (H5M) API: @H5_HAVE_MAP_API@
                         Direct VFD: @H5_HAVE_DIRECT@
                         Mirror VFD: @H5_HAVE_MIRROR_VFD@
                      Subfiling VFD: @H5_HAVE_SUBFILING_VFD@