Sync with develop (#1863)feature/onion_vfd

3 files changed, 6 insertions, 135 deletions

diff --git a/config/cmake_ext_mod/ConfigureChecks.cmake b/config/cmake_ext_mod/ConfigureChecks.cmake
index 6242b12..2312929 100644
--- a/config/cmake_ext_mod/ConfigureChecks.cmake
+++ b/config/cmake_ext_mod/ConfigureChecks.cmake
@@ -326,10 +326,6 @@ if (NOT APPLE)
   HDF_CHECK_TYPE_SIZE (long         ${HDF_PREFIX}_SIZEOF_LONG)
 endif ()
 HDF_CHECK_TYPE_SIZE ("long long"    ${HDF_PREFIX}_SIZEOF_LONG_LONG)
-HDF_CHECK_TYPE_SIZE (__int64        ${HDF_PREFIX}_SIZEOF___INT64)
-if (NOT ${HDF_PREFIX}_SIZEOF___INT64)
-  set (${HDF_PREFIX}_SIZEOF___INT64 0)
-endif ()
 
 HDF_CHECK_TYPE_SIZE (float          ${HDF_PREFIX}_SIZEOF_FLOAT)
 HDF_CHECK_TYPE_SIZE (double         ${HDF_PREFIX}_SIZEOF_DOUBLE)
@@ -497,7 +493,6 @@ endif ()
 if (MINGW OR NOT WINDOWS)
   foreach (other_test
       HAVE_ATTRIBUTE
-      HAVE_C99_DESIGNATED_INITIALIZER
       SYSTEM_SCOPE_THREADS
       HAVE_SOCKLEN_T
   )
@@ -567,54 +562,6 @@ if (WINDOWS)
   endif ()
 endif ()
 
-#-----------------------------------------------------------------------------
-# Check how to print a Long Long integer
-#-----------------------------------------------------------------------------
-if (NOT ${HDF_PREFIX}_PRINTF_LL_WIDTH OR ${HDF_PREFIX}_PRINTF_LL_WIDTH MATCHES "unknown")
-  set (PRINT_LL_FOUND 0)
-  if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-    message (VERBOSE "Checking for appropriate format for 64 bit long:")
-  endif ()
-  set (CURRENT_TEST_DEFINITIONS "-DPRINTF_LL_WIDTH")
-  if (${HDF_PREFIX}_SIZEOF_LONG_LONG)
-    set (CURRENT_TEST_DEFINITIONS "${CURRENT_TEST_DEFINITIONS} -DHAVE_LONG_LONG")
-  endif ()
-  TRY_RUN (${HDF_PREFIX}_PRINTF_LL_TEST_RUN   ${HDF_PREFIX}_PRINTF_LL_TEST_COMPILE
-      ${CMAKE_BINARY_DIR}
-      ${HDF_RESOURCES_EXT_DIR}/HDFTests.c
-      COMPILE_DEFINITIONS "${CURRENT_TEST_DEFINITIONS}"
-      RUN_OUTPUT_VARIABLE OUTPUT
-  )
-  if (${HDF_PREFIX}_PRINTF_LL_TEST_COMPILE)
-    if (${HDF_PREFIX}_PRINTF_LL_TEST_RUN MATCHES 0)
-      string(REGEX REPLACE ".*PRINTF_LL_WIDTH=\\[(.*)\\].*" "\\1" ${HDF_PREFIX}_PRINTF_LL "${OUTPUT}")
-      set (${HDF_PREFIX}_PRINTF_LL_WIDTH "\"${${HDF_PREFIX}_PRINTF_LL}\"" CACHE INTERNAL "Width for printf for type `long long' or `__int64', us. `ll")
-      set (PRINT_LL_FOUND 1)
-    else ()
-      if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-        message (VERBOSE "Width test failed with result: ${${HDF_PREFIX}_PRINTF_LL_TEST_RUN}")
-      endif ()
-    endif ()
-  else ()
-    file (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
-        "Test ${HDF_PREFIX}_PRINTF_LL_WIDTH failed\n"
-    )
-  endif ()
-
-  if (PRINT_LL_FOUND)
-    if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-      message (VERBOSE "Checking for appropriate format for 64 bit long: found ${${HDF_PREFIX}_PRINTF_LL_WIDTH}")
-    endif ()
-  else ()
-    if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-      message (VERBOSE "Checking for appropriate format for 64 bit long: not found")
-    endif ()
-    set (${HDF_PREFIX}_PRINTF_LL_WIDTH "\"unknown\"" CACHE INTERNAL
-        "Width for printf for type `long long' or `__int64', us. `ll"
-    )
-  endif ()
-endif ()
-
 # ----------------------------------------------------------------------
 # Set the flag to indicate that the machine can handle converting
 # denormalized floating-point values.
diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake
index 0f9b367..260fd55 100644
--- a/config/cmake_ext_mod/HDFMacros.cmake
+++ b/config/cmake_ext_mod/HDFMacros.cmake
@@ -267,10 +267,14 @@ macro (HDF_README_PROPERTIES target_fortran)
       elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^19.*")
         if (${CMAKE_C_COMPILER_VERSION} MATCHES "^19.0.*")
           set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2015")
-        elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^19.16.*")
+        elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^19.1.*")
           set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2017")
-        else () #19.23
+        elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^19.2.*")
           set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2019")
+        elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^19.3.*")
+          set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2022")
+        else ()
+          set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO ???")
         endif ()
       else ()
         set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO ${CMAKE_C_COMPILER_VERSION}")
diff --git a/config/cmake_ext_mod/HDFTests.c b/config/cmake_ext_mod/HDFTests.c
index 2b2a202..66b9bf6 100644
--- a/config/cmake_ext_mod/HDFTests.c
+++ b/config/cmake_ext_mod/HDFTests.c
@@ -11,38 +11,6 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 #define SIMPLE_TEST(x) int main(){ x; return 0; }
 
-#ifdef HAVE_C99_DESIGNATED_INITIALIZER
-
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-extern "C"
-#  endif
-int FC_DUMMY_MAIN()
-{ return 1;}
-#endif
-#endif
-int
-main ()
-{
-
-  typedef struct
-  {
-    int x;
-    union
-    {
-      int i;
-      double d;
-    }u;
-  }di_struct_t;
-  di_struct_t x =
-  { 0,
-    { .d = 0.0}};
-  ;
-  return 0;
-}
-
-#endif
 
 #ifdef HAVE_ATTRIBUTE
 
@@ -80,54 +48,6 @@ SIMPLE_TEST(timezone=0);
 
 #endif /* HAVE_TIMEZONE */
 
-#ifdef PRINTF_LL_WIDTH
-
-#ifdef HAVE_LONG_LONG
-#  define LL_TYPE long long
-#else /* HAVE_LONG_LONG */
-#  define LL_TYPE __int64
-#endif /* HAVE_LONG_LONG */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#if defined(_MSC_VER) && defined(_DEBUG)
-# include <crtdbg.h>
-int DebugReport(int reportType, char* message, int* returnValue)
-{
-  (void)reportType;
-  (void)message;
-  (void)returnValue;
-  return 1; /* no further handling required */
-}
-#endif
-
-int main(void)
-{
-  char *llwidthArgs[] = { "I64", "l64", "ll", "l", "L", "q", NULL };
-  char *s = malloc(128);
-  char **currentArg = NULL;
-  LL_TYPE x = (LL_TYPE)1048576 * (LL_TYPE)1048576;
-  #if defined(_MSC_VER) && defined(_DEBUG)
-    _CrtSetReportHook(DebugReport);
-  #endif
-  for (currentArg = llwidthArgs; *currentArg != NULL; currentArg++)
-    {
-    char formatString[64];
-    snprintf(formatString, sizeof(formatString), "%%%sd", *currentArg);
-    snprintf(s, 128, formatString, x);
-    if (strcmp(s, "1099511627776") == 0)
-      {
-      printf("PRINTF_LL_WIDTH=[%s]\n", *currentArg);
-      return 0;
-      }
-    }
-  return 1;
-}
-
-#endif /* PRINTF_LL_WIDTH */
-
 #ifdef SYSTEM_SCOPE_THREADS
 #include <stdlib.h>
 #include <pthread.h>