1.10 Merge windows compiler fixes #912 (#915)

* Merge windows compiler fixes #912

* Merge changes to check for pwd.h header

* Add missing define

* Merge Remove incorrect compiler check for windows clang sanitizer #942

2 files changed, 35 insertions, 28 deletions

diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in
index 6329cbc..a8c9596 100644
--- a/config/cmake/H5pubconf.h.in
+++ b/config/cmake/H5pubconf.h.in
@@ -289,6 +289,9 @@
 /* Define to 1 if you have the <pthread.h> header file. */
 #cmakedefine H5_HAVE_PTHREAD_H @H5_HAVE_PTHREAD_H@
 
+/* Define to 1 if you have the <pwd.h> header file. */
+#cmakedefine H5_HAVE_PWD_H @H5_HAVE_PWD_H@
+
 /* Define to 1 if you have the <quadmath.h> header file. */
 #cmakedefine H5_HAVE_QUADMATH_H @H5_HAVE_QUADMATH_H@
 
@@ -670,15 +673,15 @@
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #cmakedefine H5_TIME_WITH_SYS_TIME @H5_TIME_WITH_SYS_TIME@
 
-/* Define using v1.10 public API symbols by default */
-#cmakedefine H5_USE_110_API_DEFAULT @H5_USE_110_API_DEFAULT@
-
 /* Define using v1.6 public API symbols by default */
 #cmakedefine H5_USE_16_API_DEFAULT @H5_USE_16_API_DEFAULT@
 
 /* Define using v1.8 public API symbols by default */
 #cmakedefine H5_USE_18_API_DEFAULT @H5_USE_18_API_DEFAULT@
 
+/* Define using v1.10 public API symbols by default */
+#cmakedefine H5_USE_110_API_DEFAULT @H5_USE_110_API_DEFAULT@
+
 /* Define if the library will use file locking */
 #cmakedefine H5_USE_FILE_LOCKING @H5_USE_FILE_LOCKING@
 
diff --git a/config/cmake/HDFCXXCompilerFlags.cmake b/config/cmake/HDFCXXCompilerFlags.cmake
index a7e241b..38db636 100644
--- a/config/cmake/HDFCXXCompilerFlags.cmake
+++ b/config/cmake/HDFCXXCompilerFlags.cmake
@@ -9,10 +9,10 @@
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
-set(CMAKE_CXX_STANDARD 98)
-set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
+set (CMAKE_CXX_STANDARD 98)
+set (CMAKE_CXX_STANDARD_REQUIRED TRUE)
 
-set(CMAKE_CXX_EXTENSIONS OFF)
+set (CMAKE_CXX_EXTENSIONS OFF)
 
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_SANITIZER_FLAGS} ${CMAKE_CXX_FLAGS}")
 if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
@@ -21,30 +21,34 @@ endif ()
 #-----------------------------------------------------------------------------
 # Compiler specific flags : Shouldn't there be compiler tests for these
 #-----------------------------------------------------------------------------
-if(WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
-  set(_INTEL_WINDOWS 1)
-endif()
+if (WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+  set (_INTEL_WINDOWS 1)
+endif ()
 
-if(WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang"
+if (WIN32 AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang"
    AND "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")
-  set(_CLANG_MSVC_WINDOWS 1)
+  set (_CLANG_MSVC_WINDOWS 1)
 endif()
 
 # MSVC 14.28 enables C5105, but the Windows SDK 10.0.18362.0 triggers it.
-if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.28)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd5105")
-endif()
+if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND CMAKE_CXX_COMPILER_LOADED)
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.28)
+    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd5105")
+  endif ()
+endif ()
 
-if (CMAKE_CXX_COMPILER_ID STREQUAL SunPro AND
-    NOT DEFINED CMAKE_CXX${CMAKE_CXX_STANDARD}_STANDARD_COMPILE_OPTION)
-  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13)
-    if (NOT CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD EQUAL 98)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++03")
-    endif()
-  else()
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -library=stlport4")
-  endif()
-endif()
+if (CMAKE_CXX_COMPILER_ID STREQUAL SunPro AND CMAKE_CXX_COMPILER_LOADED)
+  if (NOT DEFINED CMAKE_CXX${CMAKE_CXX_STANDARD}_STANDARD_COMPILE_OPTION)
+    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13)
+      if (NOT CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD EQUAL 98)
+        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++03")
+      endif ()
+    else ()
+      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -library=stlport4")
+    endif ()
+  endif ()
+endif ()
 
 if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_LOADED)
   set (CMAKE_CXX_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_CXX_FLAGS}")
@@ -299,7 +303,7 @@ endif ()
 # This option will force/override the default setting for all configurations
 #-----------------------------------------------------------------------------
 if (HDF5_ENABLE_SYMBOLS MATCHES "YES")
-  if(CMAKE_CXX_COMPILER_LOADED)
+  if (CMAKE_CXX_COMPILER_LOADED)
     if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND NOT _INTEL_WINDOWS)
       set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
     elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
@@ -307,7 +311,7 @@ if (HDF5_ENABLE_SYMBOLS MATCHES "YES")
     endif ()
   endif ()
 elseif (HDF5_ENABLE_SYMBOLS MATCHES "NO")
-  if(CMAKE_CXX_COMPILER_LOADED)
+  if (CMAKE_CXX_COMPILER_LOADED)
     if (CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND NOT _INTEL_WINDOWS)
       set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-s")
     elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
@@ -321,7 +325,7 @@ endif ()
 # This option will force/override the default setting for all configurations
 #-----------------------------------------------------------------------------
 if (HDF5_ENABLE_PROFILING)
-  if(CMAKE_CXX_COMPILER_LOADED)
+  if (CMAKE_CXX_COMPILER_LOADED)
     list (APPEND HDF5_CMAKE_CXX_FLAGS "${PROFILE_CXXFLAGS}")
   endif ()
 endif ()
@@ -331,7 +335,7 @@ endif ()
 # This option will force/override the default setting for all configurations
 #-----------------------------------------------------------------------------
 if (HDF5_ENABLE_OPTIMIZATION)
-  if(CMAKE_CXX_COMPILER_LOADED)
+  if (CMAKE_CXX_COMPILER_LOADED)
     list (APPEND HDF5_CMAKE_CXX_FLAGS "${OPTIMIZE_CXXFLAGS}")
   endif ()
 endif ()